Merge branch 'linus' into x86/apic
authorIngo Molnar <mingo@elte.hu>
Fri, 17 Apr 2009 14:18:22 +0000 (16:18 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 17 Apr 2009 14:18:28 +0000 (16:18 +0200)
commit5043124e660fcc3ddefe4239ddfa017bf13f5081
tree06875cdb942afe460dbac33acf3e8223c805a35d
parent77857dc07247ed5fa700a197c96ef842d8dbebdf
parent9f76208c33984ab777eace5d07a4e36e88703e02
Merge branch 'linus' into x86/apic

Merge reason: new intr-remap patches depend on the s2ram iommu fixes from upstream

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/apic/apic.c
arch/x86/kernel/apic/io_apic.c
arch/x86/kernel/irq.c