Thomas Gleixner 268a3dcfea 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>

2008-10-22 09:48:06 +02:00

..

clockevents.c

…

clocksource.c

…

jiffies.c

…

Kconfig

…

Makefile

…

ntp.c

Merge branch 'timers/range-hrtimers' into v28-range-hrtimers-for-linus-v2

2008-10-22 09:48:06 +02:00

tick-broadcast.c

NOHZ: restart tick device from irq_enter()

2008-10-17 18:13:38 +02:00

tick-common.c

…

tick-internal.h

NOHZ: restart tick device from irq_enter()

2008-10-17 18:13:38 +02:00

tick-oneshot.c

…

tick-sched.c

Merge branch 'timers/range-hrtimers' into v28-range-hrtimers-for-linus-v2

2008-10-22 09:48:06 +02:00

timekeeping.c

Merge branches 'timers/clocksource', 'timers/hrtimers', 'timers/nohz', 'timers/ntp', 'timers/posixtimers' and 'timers/debug' into v28-timers-for-linus

2008-10-20 13:14:06 +02:00

timer_list.c

Merge branch 'timers/range-hrtimers' into v28-range-hrtimers-for-linus-v2

2008-10-22 09:48:06 +02:00

timer_stats.c

…