From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Jul 2012 19:25:47 +0000 (-0700)
Subject: Merge branch 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~3680^2~2417
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d5d96ed2d89ea228bdc27980b8ee4c94422ddef5;p=firefly-linux-kernel-4.4.55.git

Merge branch 'x86-reboot-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86/reboot changes from Ingo Molnar:
 "Now that the revampted x86 real-mode trampoline code is upstream and
  seems to be working well, we can extend the 64-bit reboot code to be
  as capable as the 32-bit one."

* 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86-64, reboot: Be more paranoid in 64-bit reboot=bios
  x86, reboot: Drop redundant write of reboot_mode
  x86-64, reboot: Allow reboot=bios and reboot-cpu override on x86-64
---

d5d96ed2d89ea228bdc27980b8ee4c94422ddef5