]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'stericsson/timer' and 'omap/dmtimer' into next/timer
authorArnd Bergmann <arnd@arndb.de>
Sun, 30 Oct 2011 23:52:14 +0000 (00:52 +0100)
committerArnd Bergmann <arnd@arndb.de>
Sun, 30 Oct 2011 23:52:14 +0000 (00:52 +0100)

Trivial merge