Merge branch 'imx-fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into...
authorOlof Johansson <olof@lixom.net>
Fri, 11 Nov 2011 16:53:46 +0000 (08:53 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 11 Nov 2011 16:53:46 +0000 (08:53 -0800)

Trivial merge