git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d886c73 3e0e1e9)
Merge branch 'x86/urgent' into x86/pat
authorH. Peter Anvin <hpa@zytor.com>
Thu, 27 Aug 2009 00:17:51 +0000 (17:17 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 27 Aug 2009 00:24:28 +0000 (17:24 -0700)
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>

Trivial merge
Pandora Kernel Repository