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

Trivial merge