]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/soc' into for-next
authorArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 22:55:14 +0000 (00:55 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 22:55:14 +0000 (00:55 +0200)

Trivial merge