]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'timers/core'
authorIngo Molnar <mingo@kernel.org>
Thu, 22 May 2014 11:54:33 +0000 (13:54 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 22 May 2014 11:54:33 +0000 (13:54 +0200)

Trivial merge