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)
Conflicts:
arch/x86/kernel/io_apic.c

Merge irq/sparseirq here, to resolve conflicts.


Trivial merge