Merge branch 'imx6q/fixes' of git://git.linaro.org/people/shawnguo/linux-2.6 into...
authorArnd Bergmann <arnd@arndb.de>
Wed, 23 Nov 2011 20:00:00 +0000 (20:00 +0000)
committerArnd Bergmann <arnd@arndb.de>
Wed, 23 Nov 2011 20:00:00 +0000 (20:00 +0000)

Trivial merge