Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorRusty Russell <rusty@rustcorp.com.au>
Mon, 29 Dec 2008 21:32:35 +0000 (07:32 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Mon, 29 Dec 2008 21:32:35 +0000 (07:32 +1030)
commit33edcf133ba93ecba2e4b6472e97b689895d805c
tree327d7a20acef64005e7c5ccbfa1265be28aeb6ac
parentbe4d638c1597580ed2294d899d9f1a2cd10e462c
parent3c92ec8ae91ecf59d88c798301833d7cf83f2179
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
24 files changed:
arch/m32r/Kconfig
arch/powerpc/kernel/smp.c
arch/powerpc/kernel/time.c
arch/powerpc/platforms/pseries/xics.c
arch/powerpc/sysdev/mpic.c
arch/s390/Kconfig
arch/s390/kernel/smp.c
arch/s390/kernel/time.c
arch/s390/kernel/topology.c
arch/x86/include/asm/pci.h
arch/x86/kernel/apic.c
arch/x86/kernel/cpu/intel_cacheinfo.c
arch/x86/kernel/hpet.c
arch/x86/kernel/io_apic.c
arch/x86/kernel/irq_64.c
arch/x86/kernel/smpboot.c
arch/x86/lguest/boot.c
include/linux/smp.h
init/Kconfig
kernel/profile.c
kernel/sched.c
kernel/sched_stats.h
kernel/trace/trace.c
lib/Kconfig