Merge branch 'x86/urgent' into x86/cleanups

author H. Peter Anvin <hpa@zytor.com>

Tue, 26 Aug 2008 05:45:37 +0000 (22:45 -0700)

committer H. Peter Anvin <hpa@zytor.com>

Tue, 26 Aug 2008 05:45:37 +0000 (22:45 -0700)
author H. Peter Anvin <hpa@zytor.com>
Tue, 26 Aug 2008 05:45:37 +0000 (22:45 -0700)
committer H. Peter Anvin <hpa@zytor.com>
Tue, 26 Aug 2008 05:45:37 +0000 (22:45 -0700)
diff --cc arch/x86/kernel/cpuid.c
Simple merge
diff --cc arch/x86/pci/irq.c
Simple merge
author	H. Peter Anvin <hpa@zytor.com>
	Tue, 26 Aug 2008 05:45:37 +0000 (22:45 -0700)
committer	H. Peter Anvin <hpa@zytor.com>
	Tue, 26 Aug 2008 05:45:37 +0000 (22:45 -0700)
		1	2
arch/x86/kernel/cpuid.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/pci/irq.c	patch \|	diff1 \|	diff2 \|	blob \| history