From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 23 Jun 2008 19:48:17 +0000 (-0700)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.26-rc8~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee5c2ab09b79d3aba3515a3eae7c5cf1e2cbc569;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'x86-fixes-for-linus' of git://git./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
---

ee5c2ab09b79d3aba3515a3eae7c5cf1e2cbc569