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

…

tick-common.c

…

tick-internal.h

…

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

…

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

…