Merge branch 'fortglx/39/tip/timers/rtc' of git://git.linaro.org/people/jstultz/linux...
authorThomas Gleixner <tglx@linutronix.de>
Thu, 12 May 2011 09:31:13 +0000 (11:31 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 12 May 2011 09:31:13 +0000 (11:31 +0200)

Trivial merge