Merge branch 'x86/mm' into auto-latest

author Ingo Molnar <mingo@elte.hu>

Tue, 6 Dec 2011 19:56:01 +0000 (20:56 +0100)

committer Ingo Molnar <mingo@elte.hu>

Tue, 6 Dec 2011 19:56:01 +0000 (20:56 +0100)
author Ingo Molnar <mingo@elte.hu>
Tue, 6 Dec 2011 19:56:01 +0000 (20:56 +0100)
committer Ingo Molnar <mingo@elte.hu>
Tue, 6 Dec 2011 19:56:01 +0000 (20:56 +0100)
diff --cc arch/x86/mm/pageattr.c
Simple merge
diff --cc init/main.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Tue, 6 Dec 2011 19:56:01 +0000 (20:56 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 6 Dec 2011 19:56:01 +0000 (20:56 +0100)
		1	2
arch/x86/mm/pageattr.c	patch \|	diff1 \|	diff2 \|	blob \| history
init/main.c	patch \|	diff1 \|	diff2 \|	blob \| history