| commit | 268a3dcfea2077fca60d3715caa5c96f9b5e6ea7 | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Wed Oct 22 09:48:06 2008 +0200 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Wed Oct 22 09:48:06 2008 +0200 |
| tree | c2232774508424e677e27f296090a68c775e4669 | |
| parent | c4bd822e7b12a9008241d76db45b665f2fef180c [diff] | |
| parent | 592aa999d6a272856c9bfbdaac0cfba1bb37c24c [diff] |
Merge branch 'timers/range-hrtimers' into v28-range-hrtimers-for-linus-v2 Conflicts: kernel/time/tick-sched.c Signed-off-by: Thomas Gleixner <tglx@linutronix.de>