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: ef1f87a 770824b)

author	Ingo Molnar <mingo@elte.hu>
	Sun, 22 Feb 2009 19:05:19 +0000 (20:05 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Sun, 22 Feb 2009 19:05:19 +0000 (20:05 +0100)
commit	fc6fc7f1b1095b92d4834e69b385b91e412a7ce5
tree	2ad451d5dac4d460830536944cef1de93be36b2a	tree \| snapshot (tar.gz zip)
parent	ef1f87aa7ba6224bef1b750b3272ba281d8f43ed	commit \| diff
parent	770824bdc421ff58a64db608294323571c949f4c	commit \| diff

Merge branch 'linus' into x86/apic

Conflicts:
arch/x86/mach-default/setup.c

Semantic conflict resolution:
arch/x86/kernel/setup.c

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

15 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
arch/ia64/include/asm/kvm.h	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/apic.c	diff1 \|	\|	blob \| history
arch/x86/kernel/apm_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mcheck/mce_amd_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mcheck/mce_intel_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/vmiclock_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mach-voyager/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/numa_64.c	diff1 \|	diff2 \|	blob \| history
drivers/xen/manage.c	diff1 \|	diff2 \|	blob \| history
kernel/kexec.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history