Merge branch 'timers/range-hrtimers' into v28-range-hrtimers-for-linus-v2
authorThomas Gleixner <tglx@linutronix.de>
Wed, 22 Oct 2008 07:48:06 +0000 (09:48 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 22 Oct 2008 07:48:06 +0000 (09:48 +0200)
commit268a3dcfea2077fca60d3715caa5c96f9b5e6ea7
treec2232774508424e677e27f296090a68c775e4669
parentc4bd822e7b12a9008241d76db45b665f2fef180c
parent592aa999d6a272856c9bfbdaac0cfba1bb37c24c
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>
include/linux/hrtimer.h
include/linux/sched.h
include/linux/time.h
kernel/fork.c
kernel/hrtimer.c
kernel/posix-timers.c
kernel/sched.c
kernel/sys.c
kernel/time/ntp.c
kernel/time/tick-sched.c
kernel/time/timer_list.c