From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 1 Apr 2014 17:10:59 +0000 (-0700)
Subject: Merge branch 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4b2ce8f15f8fdcd8a73dd31664b252e2b4ed174a;p=linux.git

Merge branch 'x86-reboot-for-linus' of git://git./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
---

4b2ce8f15f8fdcd8a73dd31664b252e2b4ed174a