| commit | ee5c2ab09b79d3aba3515a3eae7c5cf1e2cbc569 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 23 12:48:17 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 23 12:48:17 2008 -0700 |
| tree | 45896aa3ae1071c089f969cdce72d83125ed459a | |
| parent | f6837bfa6506892e889ec79d8ab29931b4468826 [diff] | |
| parent | ebb9cfe20fe167f29960a5e913193a684fac50bf [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: 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