diff options
author | 2014-04-01 10:10:59 -0700 | |
---|---|---|
committer | 2014-04-01 10:10:59 -0700 | |
commit | 4b2ce8f15f8fdcd8a73dd31664b252e2b4ed174a (patch) | |
tree | a583c70fa8913aa434f112ca9a25fffebd7ab524 /tools/perf/scripts/python/call-graph-from-postgresql.py | |
parent | Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
parent | x86, reboot: Only use CF9_COND automatically, not CF9 (diff) | |
download | linux-dev-4b2ce8f15f8fdcd8a73dd31664b252e2b4ed174a.tar.xz linux-dev-4b2ce8f15f8fdcd8a73dd31664b252e2b4ed174a.zip |
Merge branch 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 reboot changes from Ingo Molnar:
"Refine the reboot logic around the CF9 and EFI reboot methods, to make
it more robust. The expectation is for no working system to break,
and for a couple of reboot-force systems to start rebooting
automatically again"
* 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, reboot: Only use CF9_COND automatically, not CF9
x86, reboot: Add EFI and CF9 reboot methods into the default list
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions