git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Ingo Molnar <mingo@elte.hu>
	Fri, 7 Jan 2011 13:14:15 +0000 (14:14 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 7 Jan 2011 13:14:15 +0000 (14:14 +0100)
commit	739e2d036c2a9c9a2f14ca53dd116490ac319032
tree	68ed0628a276b33cb5aa0ad4899c1afe0a33a69d	tree \| snapshot
parent	cd1e70bc664eb5d70566943fda8007588414acce	commit \| diff
parent	26e9d61fe37a14aaeeaae876858941dc9d6d7a3f	commit \| diff

Merge branch 'linus' into x86/apic-cleanups

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

Merge reason: Resolve the conflict, update to a more recent -rc base

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

Linux Kernel Source Tree.

RSS Atom

arch/x86/kernel/acpi/boot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/io_apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/platform/sfi/sfi.c	diff1 \|	diff2 \|	blob \| history