diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-05-02 21:37:03 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-05-02 21:37:08 +0200 |
| commit | 3687a2c0d81b23d30db4384ca804a701fc686e16 (patch) | |
| tree | 8f0582f6939ef9f0f7079bbbcc4025e46ea19f79 | |
| parent | b4d246b12410b53506c311e5e0b6abb71ead65c6 (diff) | |
| parent | c7bcecbe98fe29e87ac7d01c70c5998806e0989f (diff) | |
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>