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

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

author	Ingo Molnar <mingo@elte.hu>
	Tue, 4 Jan 2011 08:43:42 +0000 (09:43 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 4 Jan 2011 08:43:42 +0000 (09:43 +0100)
commit	5e1620e9537d85cbd5ffdbbaba318f1628bd9c7d
tree	d223d410b868b80d4c0deec192d354a5d06b201a	tree \| snapshot
parent	2f56eb2dfcf5e6da79a4b52f4004b59d1229f54e	commit \| diff
parent	099756b9ca3e7d2e66f30c3d6be51e198342ff4d	commit \| diff

Merge commit 'v2.6.37-rc8' into x86/apic

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

Merge reason: move to a fresh -rc, resolve the conflict.

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

Linux Kernel Source Tree.

RSS Atom

arch/x86/include/asm/apic.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/io_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/apic/io_apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history