Merge branch 'fortglx/3.0/tip/timers/ptp' of git://git.linaro.org/people/jstultz...
authorThomas Gleixner <tglx@linutronix.de>
Mon, 6 Jun 2011 19:12:32 +0000 (21:12 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 6 Jun 2011 19:12:32 +0000 (21:12 +0200)

Trivial merge