Rusty Russell 2ca1a61583 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:

	arch/x86/kernel/io_apic.c

2008-12-31 23:05:57 +10:30

..

clockevents.c

…

clocksource.c

…

jiffies.c

…

Kconfig

…

Makefile

…

ntp.c

…

tick-broadcast.c

…

tick-common.c

…

tick-internal.h

…

tick-oneshot.c

…

tick-sched.c

…

timekeeping.c

…

timer_list.c

…

timer_stats.c

…