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: a146649 0cd5c3c)

author	Ingo Molnar <mingo@elte.hu>
	Sat, 31 Jan 2009 16:32:31 +0000 (17:32 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 5 Feb 2009 21:30:01 +0000 (22:30 +0100)
commit	9d45cf9e36bf9bcf16df6e1cbf049807c8402823
tree	2118a16701418af10d215d2174df7ee0a5cbe6bd	tree \| snapshot (tar.gz zip)
parent	a146649bc19d5eba4f5bfac6720c5f252d517a71	commit \| diff
parent	0cd5c3c80a0ebd68c08312fa7d8c13149cc61c4c	commit \| diff

Merge branch 'x86/urgent' into x86/apic

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

Semantic merge:
arch/x86/kernel/irqinit_32.c

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

17 files changed:

arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig.cpu	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/pgtable.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/intel_cacheinfo.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/io_apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mach-voyager/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mach-voyager/voyager_smp.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/multicalls.h	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/efx.c	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/irq/chip.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/numa_migrate.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history