Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 8 Apr 2010 09:47:05 +0000 (10:47 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 8 Apr 2010 09:47:05 +0000 (10:47 +0100)
commitbb3c9d4f851d51bb6302ef0df830dcec88d7c529
tree446463d0b86dcf68b3a1538861422b1ce582de16
parentd4d9959c099751158c5cf14813fe378e206339c6
parentb3aa111f7ac1ad07009081a824b5ce7a71462c4c
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6

Conflicts:
arch/arm/mach-mx3/mach-pcm037.c
arch/arm/mach-mx3/mach-pcm037.c