Merge ../linux-2.6-x86
authorRusty Russell <rusty@rustcorp.com.au>
Sat, 13 Dec 2008 11:25:51 +0000 (21:25 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Sat, 13 Dec 2008 11:25:51 +0000 (21:25 +1030)
commit968ea6d80e395cf11a51143cfa1b9a14ada676df
treedc2acec8c9bdced33afe1e273ee5e0b0b93d2703
parent7be7585393d311866653564fbcd10a3232773c0b
parent8299608f140ae321e4eb5d1306184265d2b9511e
Merge ../linux-2.6-x86

Conflicts:

arch/x86/kernel/io_apic.c
kernel/sched.c
kernel/sched_stats.h
15 files changed:
arch/m32r/Kconfig
arch/x86/kernel/io_apic.c
arch/x86/kernel/irq_32.c
arch/x86/kernel/irq_64.c
arch/x86/kernel/smpboot.c
drivers/xen/events.c
include/linux/interrupt.h
include/linux/irq.h
init/Kconfig
kernel/irq/chip.c
kernel/irq/proc.c
kernel/profile.c
kernel/sched.c
kernel/sched_stats.h
kernel/trace/trace.c