Merge branch 'x86/urgent' into x86/pat

author Ingo Molnar <mingo@elte.hu>

Wed, 25 Feb 2009 15:40:10 +0000 (16:40 +0100)

committer Ingo Molnar <mingo@elte.hu>

Wed, 25 Feb 2009 15:40:10 +0000 (16:40 +0100)
author Ingo Molnar <mingo@elte.hu>
Wed, 25 Feb 2009 15:40:10 +0000 (16:40 +0100)
committer Ingo Molnar <mingo@elte.hu>
Wed, 25 Feb 2009 15:40:10 +0000 (16:40 +0100)
diff --cc arch/x86/include/asm/io.h
Simple merge
diff --cc arch/x86/mm/ioremap.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Wed, 25 Feb 2009 15:40:10 +0000 (16:40 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 25 Feb 2009 15:40:10 +0000 (16:40 +0100)
		1	2
arch/x86/include/asm/io.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/ioremap.c	patch \|	diff1 \|	diff2 \|	blob \| history