]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 15f7176 65fb0d2)
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:33 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Tue, 31 Mar 2009 03:03:50 +0000 (13:33 +1030)
commit558f6ab9106e6be701acb0257e7171df1bbccf04
tree6e811633baeb676693c493f6c82bf785cab2771dtree | snapshot
parent15f7176eb1cccec0a332541285ee752b935c1c85commit | diff
parent65fb0d23fcddd8697c871047b700c78817bdaa43commit | diff
Merge branch 'cpumask-for-linus' of git://git.kernel.org/pub/scm/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 diff1 | diff2 | blob | history
arch/x86/kernel/apm_32.c diff1 | diff2 | blob | history
drivers/pci/pci-driver.c diff1 | diff2 | blob | history
kernel/sched.c diff1 | diff2 | blob | history
mm/page_alloc.c diff1 | diff2 | blob | history
mm/slab.c diff1 | diff2 | blob | history
mm/vmscan.c diff1 | diff2 | blob | history
net/sunrpc/svc.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.