Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
authorLinus Torvalds <[email protected]>
Mon, 3 Mar 2008 18:36:50 +0000 (10:36 -0800)
committerLinus Torvalds <[email protected]>
Mon, 3 Mar 2008 18:36:50 +0000 (10:36 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86: revert "x86: fix pmd_bad and pud_bad to support huge pages"
  x86: revert "x86: CPA: avoid split of alias mappings"


Trivial merge