Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull x86 fixes from Ingo Molnar:
 "Misc fixes: a SYSRET single-stepping fix, a dmi-scan robustization
  fix, a reboot quirk and a kgdb fixlet"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  kgdb/x86: Fix reporting of 'si' in kgdb on x86_64
  x86/asm/entry/64: Disable opportunistic SYSRET if regs->flags has TF set
  x86/reboot: Add ASRock Q1900DC-ITX mainboard reboot quirk
  MAINTAINERS: Change the x86 microcode loader maintainer
  firmware: dmi_scan: Prevent dmi_num integer overflow

diff --combined MAINTAINERS
index ac976acd9841031c816ed5885bc19df0d3793677,e04362883ea34a11d65f90409b69bc6ae1325e30..efbcb50e496954934295b3147e1de9dbdd05ff9e
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -637,8 -637,7 +637,7 @@@ F:      drivers/gpu/drm/radeon/radeon_k
  F:      include/uapi/linux/kfd_ioctl.h
  
  AMD MICROCODE UPDATE SUPPORT
- M:    Andreas Herrmann <[email protected]>
- L:    [email protected]
+ M:    Borislav Petkov <[email protected]>
  S:    Maintained
  F:    arch/x86/kernel/cpu/microcode/amd*
  
@@@ -5095,7 -5094,7 +5094,7 @@@ S:      Supporte
  F:    drivers/platform/x86/intel_menlow.c
  
  INTEL IA32 MICROCODE UPDATE SUPPORT
- M:    Tigran Aivazian <[email protected]>
+ M:    Borislav Petkov <[email protected]>
  S:    Maintained
  F:    arch/x86/kernel/cpu/microcode/core*
  F:    arch/x86/kernel/cpu/microcode/intel*
@@@ -5136,21 -5135,22 +5135,21 @@@ M:   Deepak Saxena <[email protected]
  S:    Maintained
  F:    drivers/char/hw_random/ixp4xx-rng.c
  
 -INTEL ETHERNET DRIVERS (e100/e1000/e1000e/fm10k/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e/i40evf)
 +INTEL ETHERNET DRIVERS
  M:    Jeff Kirsher <[email protected]>
 -M:    Jesse Brandeburg <[email protected]>
 -M:    Bruce Allan <[email protected]>
 -M:    Carolyn Wyborny <[email protected]>
 -M:    Don Skidmore <[email protected]>
 -M:    Greg Rose <[email protected]>
 -M:    Matthew Vick <[email protected]>
 -M:    John Ronciak <[email protected]>
 -M:    Mitch Williams <[email protected]>
 -M:    Linux NICS <[email protected]>
 -L:    [email protected]
 +R:    Jesse Brandeburg <[email protected]>
 +R:    Shannon Nelson <[email protected]>
 +R:    Carolyn Wyborny <[email protected]>
 +R:    Don Skidmore <[email protected]>
 +R:    Matthew Vick <[email protected]>
 +R:    John Ronciak <[email protected]>
 +R:    Mitch Williams <[email protected]>
 +L:    [email protected]
  W:    http://www.intel.com/support/feedback.htm
  W:    http://e1000.sourceforge.net/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git
 +Q:    http://patchwork.ozlabs.org/project/intel-wired-lan/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git
  S:    Supported
  F:    Documentation/networking/e100.txt
  F:    Documentation/networking/e1000.txt