git.maquefel.me Git - linux.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	bc030d6cb9532877c1c5a3f5e7123344fa24a285
tree	d223d410b868b80d4c0deec192d354a5d06b201a	tree \| snapshot
parent	d3bd058826aa8b79590cca6c8e6d1557bf576ada	commit \| diff
parent	387c31c7e5c9805b0aef8833d1731a5fe7bdea14	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>

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

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