Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 3 May 2010 10:52:23 +0000 (11:52 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 3 May 2010 10:52:23 +0000 (11:52 +0100)
commitab92e74f799a1cbc6b3c9bf90ed05403689ddecc
tree4b4e8c0ecc000913d2d6e8959174e5b5dc4b63de
parentea5ce655b90f5debb7b9768284eaafcca218ddef
parent17807f913bdbb2c5b4d0f6b168b4f68d5cece7e3
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6