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)
commit3687a2c0d81b23d30db4384ca804a701fc686e16
tree8f0582f6939ef9f0f7079bbbcc4025e46ea19f79
parentb4d246b12410b53506c311e5e0b6abb71ead65c6
parentc7bcecbe98fe29e87ac7d01c70c5998806e0989f
Merge branch 'linus' into timers/core

Reason: Pick up the hrtimer_clock_to_base_table fix from mainline

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