Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorRusty Russell <rusty@rustcorp.com.au>
Wed, 31 Dec 2008 12:35:57 +0000 (22:35 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Wed, 31 Dec 2008 12:35:57 +0000 (22:35 +1030)
commit2ca1a615835d9f4990f42102ab1f2ef434e7e89c
tree726cf3d5f29a6c66c44e4bd68e7ebed2fd83d059
parente12f0102ac81d660c9f801d0a0e10ccf4537a9de
parent6a94cb73064c952255336cc57731904174b2c58f
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:

arch/x86/kernel/io_apic.c
29 files changed:
arch/arm/kernel/smp.c
arch/arm/mach-at91/at91rm9200_time.c
arch/arm/mach-pxa/time.c
arch/arm/mach-realview/core.c
arch/arm/mach-realview/localtimer.c
arch/arm/mach-sa1100/time.c
arch/arm/mach-versatile/core.c
arch/sparc/kernel/irq_64.c
arch/sparc/kernel/of_device_64.c
arch/sparc/kernel/pci_msi.c
arch/sparc/kernel/smp_32.c
arch/sparc/kernel/smp_64.c
arch/sparc/kernel/sparc_ksyms_32.c
arch/sparc/kernel/time_64.c
arch/x86/include/asm/pci.h
arch/x86/kernel/hpet.c
arch/x86/kernel/io_apic.c
arch/x86/kernel/irq_32.c
arch/x86/kernel/irq_64.c
drivers/xen/events.c
include/linux/interrupt.h
include/linux/irq.h
init/Kconfig
kernel/irq/chip.c
kernel/irq/manage.c
kernel/irq/proc.c
kernel/sched.c
kernel/trace/trace.c
mm/slub.c