tree cd851ce4fa71b2653f120d7f11a9c6cbcf311b19
parent ab7e79243746e2a9c5f00243e60108189c44c9eb
parent 38cc1c3df77c1bb739a4766788eb9fa49f16ffdf
author Ingo Molnar <mingo@elte.hu> 1219378011 +0200
committer Ingo Molnar <mingo@elte.hu> 1219378011 +0200

Merge branch 'x86/urgent' into x86/pat

Conflicts:
	arch/x86/mm/pageattr.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>