Merge branch 'imx/compile-fixes' of git://git.linaro.org/people/shawnguo/linux-2...
authorOlof Johansson <olof@lixom.net>
Wed, 9 Nov 2011 16:59:30 +0000 (08:59 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 9 Nov 2011 16:59:30 +0000 (08:59 -0800)

Trivial merge