git.maquefel.me Git - linux.git/commit

author	Thomas Gleixner <tglx@linutronix.de>
	Thu, 9 Dec 2010 17:17:25 +0000 (18:17 +0100)
committer	Thomas Gleixner <tglx@linutronix.de>
	Thu, 9 Dec 2010 17:17:25 +0000 (18:17 +0100)
commit	d834a9dcecae834cd6b2bc5e50e1907738d9cf6a
tree	0589d753465d3fe359ba451ba6cb7798df03aaa2	tree \| snapshot
parent	a38c5380ef9f088be9f49b6e4c5d80af8b1b5cd4	commit \| diff
parent	f658bcfb2607bf0808966a69cf74135ce98e5c2d	commit \| diff

Merge branch 'x86/amd-nb' into x86/apic-cleanups

Reason: apic cleanup series depends on x86/apic, x86/amd-nb x86/platform

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

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

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/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