Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 7 Feb 2011 15:15:37 +0000 (15:15 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 7 Feb 2011 15:15:41 +0000 (15:15 +0000)

Trivial merge