diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-02 14:43:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-02 14:43:58 -0700 |
| commit | a8bdf745126593308927dfa264d3d2158338a148 (patch) | |
| tree | d99e50133bac166ae4017ca4f0143c3e57da3825 /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | Merge tag 'pinctrl-fixes-v3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl (diff) | |
| parent | x86-64, init: Do not set NX bits on non-NX capable hardware (diff) | |
| download | linux-dev-a8bdf745126593308927dfa264d3d2158338a148.tar.xz linux-dev-a8bdf745126593308927dfa264d3d2158338a148.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Peter Anvin:
"Two regression fixes:
1. On 64 bits, we would set NX on non-NX-capable hardware (very rare
in 64-bit land, but a nonzero subset.)
2. Fix suspend/resume across kernel versions"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86-64, init: Do not set NX bits on non-NX capable hardware
x86, gdt, hibernate: Store/load GDT for hibernate path.
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions