Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 2 Mar 2010 23:29:32 +0000 (23:29 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 2 Mar 2010 23:29:32 +0000 (23:29 +0000)
Conflicts:
arch/arm/Makefile


Trivial merge