Merge branch 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorRusty Russell <rusty@rustcorp.com.au>
Tue, 31 Mar 2009 03:03:50 +0000 (13:03 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Tue, 31 Mar 2009 03:03:50 +0000 (13:03 +1030)
commit558f6ab9106e6be701acb0257e7171df1bbccf04
tree6e811633baeb676693c493f6c82bf785cab2771d
parent15f7176eb1cccec0a332541285ee752b935c1c85
parent65fb0d23fcddd8697c871047b700c78817bdaa43
Merge branch 'cpumask-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

Conflicts:

arch/x86/include/asm/topology.h
drivers/oprofile/buffer_sync.c
(Both cases: changed in Linus' tree, removed in Ingo's).
arch/x86/include/asm/topology.h
arch/x86/kernel/apm_32.c
drivers/pci/pci-driver.c
kernel/sched.c
mm/page_alloc.c
mm/slab.c
mm/vmscan.c
net/sunrpc/svc.c