From: H. Peter Anvin <hpa@zytor.com>
Date: Thu, 27 Aug 2009 00:17:51 +0000 (-0700)
Subject: Merge branch 'x86/urgent' into x86/pat
X-Git-Tag: v2.6.32-rc1~680^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b855192c08fcb14adbc5d3a7cab182022d433cca;p=pandora-kernel.git

Merge branch 'x86/urgent' into x86/pat

Reason: Change to is_new_memtype_allowed() in x86/urgent

Resolved semantic conflicts in:

	 arch/x86/mm/pat.c
	 arch/x86/mm/ioremap.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---

b855192c08fcb14adbc5d3a7cab182022d433cca
Reading git-diff-tree failed