Merge branch 'mxc-defconfig-updates' of git://git.pengutronix.de/git/imx/linux-2.6
authorRussell King <[email protected]>
Thu, 30 Jul 2009 09:47:09 +0000 (10:47 +0100)
committerRussell King <[email protected]>
Thu, 30 Jul 2009 09:47:09 +0000 (10:47 +0100)

Trivial merge