Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 23 Nov 2010 09:37:25 +0000 (09:37 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 23 Nov 2010 09:37:25 +0000 (09:37 +0000)
commitf6a1f2184c0ea85ad98a4d6e450ad584423d10ce
tree2e5f74b714dd46d2c781392fa330c0c339b5919e
parentb0c4d4ee4e4f13fa3f017c00319a18c1ea31b7d7
parent46e3f3075931493f65e9561ef57bcc23fe077a13
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6