Merge branch 'linus' into irq/numa
authorIngo Molnar <mingo@elte.hu>
Mon, 1 Jun 2009 19:06:21 +0000 (21:06 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 1 Jun 2009 19:06:21 +0000 (21:06 +0200)
commit3d58f48ba05caed9118bce62b3047f8683438835
tree94c911034f0e14ded73d3e9e6e9f8e22b6cad822
parentabfe0af9813153bae8c85d9bac966bafcb8ddab1
parentd9244b5d2fbfe9fa540024b410047af13ceec90f
Merge branch 'linus' into irq/numa

Conflicts:
arch/mips/sibyte/bcm1480/irq.c
arch/mips/sibyte/sb1250/irq.c

Merge reason: we gathered a few conflicts plus update to latest upstream fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Documentation/kernel-parameters.txt
arch/arm/common/gic.c
arch/mips/sibyte/bcm1480/irq.c
arch/mips/sibyte/sb1250/irq.c
arch/powerpc/sysdev/mpic.c
arch/x86/Kconfig
arch/x86/kernel/Makefile
arch/x86/kernel/apic/es7000_32.c
arch/x86/kernel/cpu/common.c
drivers/pci/intel-iommu.c