]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/fixes' into for-next
authorArnd Bergmann <arnd@arndb.de>
Fri, 21 Oct 2011 14:37:54 +0000 (16:37 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 21 Oct 2011 14:37:54 +0000 (16:37 +0200)

Trivial merge