tree a82f9378da66021881c06a348eb3e767ded4e04f
parent 585a7c666e67b7a6757bd12b734e22f4f76998a2
parent 11d4c3f9b671720e80353dd7e433ff2bf65e9500
author Linus Torvalds <torvalds@linux-foundation.org> 1297022590 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1297022590 -0800

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