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)

Trivial merge