Merge branch 'mxs/fixes' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
authorArnd Bergmann <arnd@arndb.de>
Tue, 6 Dec 2011 14:18:36 +0000 (14:18 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 6 Dec 2011 14:18:36 +0000 (14:18 +0000)

Trivial merge