]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'imx-features' of git://git.pengutronix.de/git/imx/linux-2.6 into imx...
authorArnd Bergmann <arnd@arndb.de>
Sat, 10 Sep 2011 21:09:51 +0000 (23:09 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 10 Sep 2011 21:09:51 +0000 (23:09 +0200)

Trivial merge