diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-01 10:10:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-01 10:10:59 -0700 |
| commit | 4b2ce8f15f8fdcd8a73dd31664b252e2b4ed174a (patch) | |
| tree | a583c70fa8913aa434f112ca9a25fffebd7ab524 /arch/x86/net/bpf_jit.S | |
| parent | 1694f0bb8f04837f5232f35051f40eefc4ad5402 (diff) | |
| parent | fb3bd7b19b2b6ef779d18573c10c00c53cd8add6 (diff) | |
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 'arch/x86/net/bpf_jit.S')
0 files changed, 0 insertions, 0 deletions