Merge branch 'auto-genirq-next' into auto-latest

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/apic/io_apic.c
Simple merge

diff --cc arch/x86/lguest/boot.c
Simple merge

diff --cc drivers/xen/events.c
Simple merge

diff --cc kernel/irq/handle.c
Simple merge

diff --cc kernel/softirq.c
Simple merge