]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'timers/for-arm' into timers/core
authorThomas Gleixner <tglx@linutronix.de>
Thu, 31 Jan 2013 21:17:10 +0000 (22:17 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 31 Jan 2013 21:17:10 +0000 (22:17 +0100)

Trivial merge