From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 3 Mar 2008 18:36:50 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
X-Git-Tag: v2.6.25-rc4~119
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=64e6269071fb1888e5ddc9ad557368cc5fa4f538;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

* 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"
---

64e6269071fb1888e5ddc9ad557368cc5fa4f538