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: 87b2030 40150d3)

author	Ingo Molnar <mingo@elte.hu>
	Tue, 24 Feb 2009 20:52:45 +0000 (21:52 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 24 Feb 2009 20:52:45 +0000 (21:52 +0100)
commit	0edcf8d6926f4038443dbc24e319530177ca0353
tree	6010af62f73d01ab673d5106f310eaf4f4228e32	tree \| snapshot (tar.gz zip)
parent	87b203079ed949de52f0d92aeae20e5e0116c12f	commit \| diff
parent	40150d37be7f7949b2ec07d511244da856647d84	commit \| diff

Merge branch 'tj-percpu' of git://git./linux/kernel/git/tj/misc into core/percpu

Conflicts:
arch/x86/include/asm/pgtable.h

arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/mmzone_32.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/pgtable.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irq_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_32.c	diff1 \|	diff2 \|	blob \| history
block/blktrace.c	diff1 \|	diff2 \|	blob \| history
include/linux/vmalloc.h	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
mm/vmalloc.c	diff1 \|	diff2 \|	blob \| history