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)
commitaf72617279f6d56163328802cf6545b95a538345
tree205d947b4b32257d8f6a0e4a248b5212ea1f1dba
parent58a394b3fae8b08e3efb04b740cb85aa4fe98d29
parent7d8b894ca135a896f32934f7d096714d5bc687e6
Merge branch 'mxs/fixes' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes