Merge branch 'for-rmk-rc' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6
authorRussell King <[email protected]>
Thu, 30 Oct 2008 15:04:22 +0000 (15:04 +0000)
committerRussell King <[email protected]>
Thu, 30 Oct 2008 15:04:22 +0000 (15:04 +0000)

Trivial merge