Merge branch 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Dec 2009 21:34:17 +0000 (13:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Dec 2009 21:34:17 +0000 (13:34 -0800)
commitb391738bd1c708fe85592410c6a7c9752689481d
treee4a27d1b98725dcc42eae65f72a9ac4375420faa
parente33c01972239fee4696679ae5f7d1f340f424999
parent2fb8f4e6a83dcaec15c1dd0ee8a6f618e7ece7f0
Merge branch 'x86-pat-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: pat: Remove ioremap_default()
  x86: pat: Clean up req_type special case for reserve_memtype()
  x86: Relegate CONFIG_PAT and CONFIG_MTRR configurability to EMBEDDED
arch/x86/Kconfig
arch/x86/mm/ioremap.c
arch/x86/mm/pat.c