Merge branch 'x86/pat' into x86/urgent
authorH. Peter Anvin <hpa@zytor.com>
Thu, 17 Sep 2009 21:40:19 +0000 (14:40 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 17 Sep 2009 21:40:49 +0000 (14:40 -0700)
Merge reason:

Suresh Siddha (1):
      x86, pat: don't use rb-tree based lookup in reserve_memtype()

... requires previous x86/pat commits already pushed to Linus.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
1  2 
arch/x86/kernel/apic/ipi.c
mm/Kconfig

Simple merge
diff --cc mm/Kconfig
Simple merge