diff options
author | 2008-06-23 12:48:17 -0700 | |
---|---|---|
committer | 2008-06-23 12:48:17 -0700 | |
commit | ee5c2ab09b79d3aba3515a3eae7c5cf1e2cbc569 (patch) | |
tree | 45896aa3ae1071c089f969cdce72d83125ed459a /include/linux/kernel.h | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband (diff) | |
parent | xen: don't drop NX bit (diff) | |
download | wireguard-linux-ee5c2ab09b79d3aba3515a3eae7c5cf1e2cbc569.tar.xz wireguard-linux-ee5c2ab09b79d3aba3515a3eae7c5cf1e2cbc569.zip |
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
Diffstat (limited to 'include/linux/kernel.h')
0 files changed, 0 insertions, 0 deletions