]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'at91/trng' into next/driver
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 16:30:25 +0000 (18:30 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 16:30:25 +0000 (18:30 +0200)

Trivial merge