Merge branch 'imx-features-assorted' of git://git.pengutronix.de/git/imx/linux-2...
authorArnd Bergmann <arnd@arndb.de>
Tue, 3 Jan 2012 21:19:19 +0000 (21:19 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 3 Jan 2012 21:19:19 +0000 (21:19 +0000)

Trivial merge