Merge branch 'fortglx/3.3/tip/timers/core' of git://git.linaro.org/people/jstultz...
authorThomas Gleixner <tglx@linutronix.de>
Mon, 5 Dec 2011 21:13:49 +0000 (22:13 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 5 Dec 2011 21:13:49 +0000 (22:13 +0100)

Trivial merge