| commit | 07675f484bb9de0c4bd0722e174cb27043dbacef | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Feb 06 12:03:10 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Feb 06 12:03:10 2011 -0800 |
| tree | a82f9378da66021881c06a348eb3e767ded4e04f | |
| parent | 585a7c666e67b7a6757bd12b734e22f4f76998a2 [diff] | |
| parent | 11d4c3f9b671720e80353dd7e433ff2bf65e9500 [diff] |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86-32: Make sure the stack is set up before we use it x86, mtrr: Avoid MTRR reprogramming on BP during boot on UP platforms x86, nx: Don't force pages RW when setting NX bits