| commit | 64e6269071fb1888e5ddc9ad557368cc5fa4f538 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Mar 03 10:36:50 2008 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Mar 03 10:36:50 2008 -0800 |
| tree | 82e9a54386adee26c15494cc3a6acf0c9a0c0a7c | |
| parent | 5ce6386b900c83aa31d0490335df421a8d544381 [diff] | |
| parent | 902955fc13259dcec1321d45251a477977fcba39 [diff] |
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"