Merge branch 'cpus4096' into irq/threaded
commit80c5520811d3805adcb15c570ea5e2d489fa5d0b
authorThomas Gleixner <tglx@linutronix.de>
Mon, 23 Mar 2009 13:50:03 +0000 (23 14:50 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 23 Mar 2009 20:20:20 +0000 (23 21:20 +0100)
treeae797a7f4af39f80e77526533d06ac23b439f0ab
parentb3e3b302cf6dc8d60b67f0e84d1fa5648889c038
parent8c083f081d0014057901c68a0a3e0f8ca7ac8d23
Merge branch 'cpus4096' into irq/threaded

Conflicts:
arch/parisc/kernel/irq.c
kernel/irq/handle.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
22 files changed:
Makefile
arch/alpha/kernel/irq.c
arch/arm/kernel/irq.c
arch/blackfin/kernel/irqchip.c
arch/ia64/kernel/irq.c
arch/parisc/kernel/irq.c
arch/powerpc/kernel/irq.c
arch/sparc/kernel/irq_64.c
arch/sparc/kernel/time_64.c
arch/x86/kernel/tsc.c
drivers/acpi/osl.c
drivers/pci/intr_remapping.c
include/linux/interrupt.h
include/linux/irq.h
include/linux/irqnr.h
kernel/irq/chip.c
kernel/irq/handle.c
kernel/irq/internals.h
kernel/irq/manage.c
kernel/irq/numa_migrate.c
kernel/module.c
mm/vmscan.c