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)
commit3bb045f1e2e51124200ef043256df4c7ad86bebd
tree78e4150fc7108bef4d8fa183d7f7dc00beb73a54
parent80938332d8cf652f6b16e0788cf0ca136befe0b5
parentdcb73bf402e0d5b28ce925dbbe4dab3b00b21eee
Merge branch 'x86/pat' into x86/urgent

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>
arch/x86/kernel/apic/ipi.c
mm/Kconfig