]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'fixes' and 'next/fixes' into for-next
authorArnd Bergmann <arnd@arndb.de>
Sat, 8 Oct 2011 19:55:26 +0000 (21:55 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 8 Oct 2011 19:55:26 +0000 (21:55 +0200)

Trivial merge