tree 3a10cafbfbf98cafacf667eb218c71300b351bfa
parent d886c73cd4cf02a71e1650cbcb6176799d78aac1
parent 3e0e1e9c5a327d4dba8490d83ef55c0564e6e8a7
author H. Peter Anvin <hpa@zytor.com> 1251332271 -0700
committer H. Peter Anvin <hpa@zytor.com> 1251332668 -0700

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>