git.stricted.de - GitHub/exynos8895/android_kernel_samsung_universal8895.git/commit

projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 15f7176 65fb0d2)

author	Rusty Russell <rusty@rustcorp.com.au>
	Tue, 31 Mar 2009 03:03:50 +0000 (13:33 +1030)
committer	Rusty Russell <rusty@rustcorp.com.au>
	Tue, 31 Mar 2009 03:03:50 +0000 (13:33 +1030)
commit	558f6ab9106e6be701acb0257e7171df1bbccf04
tree	6e811633baeb676693c493f6c82bf785cab2771d	tree \| snapshot (tar.gz zip)
parent	15f7176eb1cccec0a332541285ee752b935c1c85	commit \| diff
parent	65fb0d23fcddd8697c871047b700c78817bdaa43	commit \| diff

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	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