Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 3 Mar 2008 18:36:50 +0000 (10:36 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 3 Mar 2008 18:36:50 +0000 (10:36 -0800)
commit64e6269071fb1888e5ddc9ad557368cc5fa4f538
tree82e9a54386adee26c15494cc3a6acf0c9a0c0a7c
parent5ce6386b900c83aa31d0490335df421a8d544381
parent902955fc13259dcec1321d45251a477977fcba39
Merge git://git./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"