Merge branch 'mxs/for-arnd' of git://git.linaro.org/people/shawnguo/linux-2.6 into...
authorArnd Bergmann <arnd@arndb.de>
Thu, 24 Nov 2011 14:51:42 +0000 (14:51 +0000)
committerArnd Bergmann <arnd@arndb.de>
Thu, 24 Nov 2011 14:51:42 +0000 (14:51 +0000)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge