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

..

acpi_pm.c

clocksource, acpi_pm.c: put acpi_pm_read_slow() under CONFIG_PCI

2008-12-12 15:05:28 +01:00

cyclone.c

…

Makefile

…

scx200_hrt.c

…

tcb_clksrc.c

cpumask: convert struct clock_event_device to cpumask pointers.

2008-12-13 21:20:26 +10:30