Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 18 Dec 2008 22:15:48 +0000 (22:15 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 18 Dec 2008 22:15:48 +0000 (22:15 +0000)

Trivial merge