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, 24 Nov 2009 10:00:10 +0000 (10:00 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 24 Nov 2009 10:00:10 +0000 (10:00 +0000)

Trivial merge