Merge branch 'linus' into timers/core
authorThomas Gleixner <tglx@linutronix.de>
Mon, 2 May 2011 19:37:03 +0000 (21:37 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 2 May 2011 19:37:08 +0000 (21:37 +0200)
Reason: Pick up the hrtimer_clock_to_base_table fix from mainline

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Trivial merge