]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/timer' into for-next
authorArnd Bergmann <arnd@arndb.de>
Fri, 16 Dec 2011 15:44:52 +0000 (15:44 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 16 Dec 2011 15:44:52 +0000 (15:44 +0000)

Trivial merge