From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 12 Nov 2013 02:33:38 +0000 (+0900)
Subject: Merge branch 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=986189f9ec81263c982b60433b5b937f1056a631;p=pandora-kernel.git

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

Pull x86 reboot changes from Ingo Molnar:
 "Misc changes - the only one with functional impact should be commit
  16c21ae5ca63 ("reboot: Allow specifying warm/cold reset for CF9 boot
  type") which extends cold/warm reboot handling to the 0xCF9 reboot
  method"

* 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/reboot: Correct pr_info() log message in the set_bios/pci/kbd_reboot()
  x86/reboot: Sort reboot DMI quirks by vendor
  x86/reboot: Remove the duplicate C6100 entry in the reboot quirks list
  reboot: Allow specifying warm/cold reset for CF9 boot type
---

986189f9ec81263c982b60433b5b937f1056a631
Reading git-diff-tree failed