Merge branch 'timers/for-arm' into timers/core
authorThomas Gleixner <tglx@linutronix.de>
Tue, 12 Feb 2013 19:22:56 +0000 (20:22 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 12 Feb 2013 19:22:56 +0000 (20:22 +0100)

Trivial merge