Merge branch 'irq/sparseirq' into cpus4096
authorIngo Molnar <mingo@elte.hu>
Wed, 17 Dec 2008 12:16:08 +0000 (13:16 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 17 Dec 2008 12:16:08 +0000 (13:16 +0100)
commit948a7b2b5e2bf126fb697aeb11ff379b2c85dd2e
tree727c744438a44d85f7dc340b1bfcb3b127c84f13
parent9466d6036f73481104039fbe99338baed11c8fea
parent17483a1f34c970e6c2cb8c082d4441bfabbe88a9
Merge branch 'irq/sparseirq' into cpus4096

Conflicts:
arch/x86/kernel/io_apic.c

Merge irq/sparseirq here, to resolve conflicts.
arch/x86/Kconfig
arch/x86/kernel/io_apic.c
include/linux/irq.h
kernel/irq/chip.c