git.stricted.de - GitHub/LineageOS/android_kernel_samsung_universal7580.git/commit

projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 56396e6 521cb40)

author	Ingo Molnar <mingo@elte.hu>
	Tue, 15 Mar 2011 07:29:44 +0000 (08:29 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 15 Mar 2011 07:29:44 +0000 (08:29 +0100)
commit	8460b3e5bc64955aeefdd8357b3bf7b5ff79b3f2
tree	7e5f6d050b72ab08a4497e82a4a103fefb086e80	tree \| snapshot (tar.gz zip)
parent	56396e6823fe9b42fe9cf9403d6ed67756255f70	commit \| diff
parent	521cb40b0c44418a4fd36dc633f575813d59a43d	commit \| diff

Merge commit 'v2.6.38' into x86/mm

Conflicts:
arch/x86/mm/numa_64.c

Merge reason: Resolve the conflict, update the branch to .38.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

arch/x86/include/asm/acpi.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/apic.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/acpi/boot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/mmu.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history