]> err.no Git - linux-2.6/commit
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 Jun 2008 19:48:17 +0000 (12:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 Jun 2008 19:48:17 +0000 (12:48 -0700)
commitee5c2ab09b79d3aba3515a3eae7c5cf1e2cbc569
tree45896aa3ae1071c089f969cdce72d83125ed459a
parentf6837bfa6506892e889ec79d8ab29931b4468826
parentebb9cfe20fe167f29960a5e913193a684fac50bf
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:
  xen: don't drop NX bit
  xen: mask unwanted pte bits in __supported_pte_mask
  xen: Use wmb instead of rmb in xen_evtchn_do_upcall().
  x86: fix NULL pointer deref in __switch_to