Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core:
  MAINTAINERS: Add an entry for i7core_edac
  i7core_edac: Avoid doing multiple probes for the same card
  i7core_edac: Properly discover the first QPI device

diff --combined MAINTAINERS
index 7642365ed6d263b7189eecd143c787a5058b6b9b,6084655152d54e513050c666774291e455d18d87..a07a49deb47bb725c701cdf0320377bf9702e153
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -896,13 -896,11 +896,13 @@@ S:      Maintaine
  
  ARM/SAMSUNG ARM ARCHITECTURES
  M:    Ben Dooks <ben-linux@fluff.org>
 +M:    Kukjin Kim <kgene.kim@samsung.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.fluff.org/ben/linux/
  S:    Maintained
 -F:    arch/arm/plat-s3c/
 +F:    arch/arm/plat-samsung/
  F:    arch/arm/plat-s3c24xx/
 +F:    arch/arm/plat-s5p/
  
  ARM/S3C2410 ARM ARCHITECTURE
  M:    Ben Dooks <ben-linux@fluff.org>
@@@ -1150,7 -1148,7 +1150,7 @@@ F:      drivers/mmc/host/atmel-mci.
  F:    drivers/mmc/host/atmel-mci-regs.h
  
  ATMEL AT91 / AT32 SERIAL DRIVER
 -M:    Haavard Skinnemoen <hskinnemoen@atmel.com>
 +M:    Nicolas Ferre <nicolas.ferre@atmel.com>
  S:    Supported
  F:    drivers/serial/atmel_serial.c
  
@@@ -1162,18 -1160,18 +1162,18 @@@ F:   drivers/video/atmel_lcdfb.
  F:    include/video/atmel_lcdc.h
  
  ATMEL MACB ETHERNET DRIVER
 -M:    Haavard Skinnemoen <hskinnemoen@atmel.com>
 +M:    Nicolas Ferre <nicolas.ferre@atmel.com>
  S:    Supported
  F:    drivers/net/macb.*
  
  ATMEL SPI DRIVER
 -M:    Haavard Skinnemoen <hskinnemoen@atmel.com>
 +M:    Nicolas Ferre <nicolas.ferre@atmel.com>
  S:    Supported
  F:    drivers/spi/atmel_spi.*
  
  ATMEL USBA UDC DRIVER
 -M:    Haavard Skinnemoen <hskinnemoen@atmel.com>
 -L:    kernel@avr32linux.org
 +M:    Nicolas Ferre <nicolas.ferre@atmel.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://avr32linux.org/twiki/bin/view/Main/AtmelUsbDeviceDriver
  S:    Supported
  F:    drivers/usb/gadget/atmel_usba_udc.*
@@@ -1583,7 -1581,7 +1583,7 @@@ F:      include/linux/coda*.
  
  COMMON INTERNET FILE SYSTEM (CIFS)
  M:    Steve French <sfrench@samba.org>
 -L:    linux-cifs-client@lists.samba.org (moderated for non-subscribers)
 +L:    linux-cifs@vger.kernel.org
  L:    samba-technical@lists.samba.org (moderated for non-subscribers)
  W:    http://linux-cifs.samba.org/
  Q:    http://patchwork.ozlabs.org/project/linux-cifs-client/list/
@@@ -2111,11 -2109,18 +2111,18 @@@ F:   drivers/edac/i5000_edac.
  
  EDAC-I5400
  M:    Mauro Carvalho Chehab <mchehab@redhat.com>
- L:    bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
+ L:    linux-edac@vger.kernel.org
  W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i5400_edac.c
  
+ EDAC-I7CORE
+ M:    Mauro Carvalho Chehab <mchehab@redhat.com>
+ L:    linux-edac@vger.kernel.org
+ W:    bluesmoke.sourceforge.net
+ S:    Maintained
+ F:    drivers/edac/i7core_edac.c linux/edac_mce.h drivers/edac/edac_mce.c
+ 
  EDAC-I82975X
  M:    Ranganathan Desikan <ravi@jetztechnologies.com>
  M:    "Arvind R." <arvind@jetztechnologies.com>
@@@ -2889,13 -2894,6 +2896,13 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/input/
  
 +INPUT MULTITOUCH (MT) PROTOCOL
 +M:    Henrik Rydberg <rydberg@euromail.se>
 +L:    linux-input@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/input/multi-touch-protocol.txt
 +K:    \b(ABS|SYN)_MT_
 +
  INTEL IDLE DRIVER
  M:    Len Brown <lenb@kernel.org>
  L:    linux-pm@lists.linux-foundation.org
@@@ -2987,14 -2985,20 +2994,14 @@@ F:   drivers/net/ixgb
  F:    drivers/net/ixgbe/
  
  INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
 -M:    Reinette Chatre <reinette.chatre@intel.com>
 -M:    Intel Linux Wireless <ilw@linux.intel.com>
  L:    linux-wireless@vger.kernel.org
 -W:    http://ipw2100.sourceforge.net
 -S:    Odd Fixes
 +S:    Orphan
  F:    Documentation/networking/README.ipw2100
  F:    drivers/net/wireless/ipw2x00/ipw2100.*
  
  INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
 -M:    Reinette Chatre <reinette.chatre@intel.com>
 -M:    Intel Linux Wireless <ilw@linux.intel.com>
  L:    linux-wireless@vger.kernel.org
 -W:    http://ipw2200.sourceforge.net
 -S:    Odd Fixes
 +S:    Orphan
  F:    Documentation/networking/README.ipw2200
  F:    drivers/net/wireless/ipw2x00/ipw2200.*
  
@@@ -3382,7 -3386,7 +3389,7 @@@ KPROBE
  M:    Ananth N Mavinakayanahalli <ananth@in.ibm.com>
  M:    Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
  M:    "David S. Miller" <davem@davemloft.net>
 -M:    Masami Hiramatsu <mhiramat@redhat.com>
 +M:    Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
  S:    Maintained
  F:    Documentation/kprobes.txt
  F:    include/linux/kprobes.h
@@@ -4215,7 -4219,6 +4222,7 @@@ OPEN FIRMWARE AND FLATTENED DEVICE TRE
  M:    Grant Likely <grant.likely@secretlab.ca>
  L:    devicetree-discuss@lists.ozlabs.org
  W:    http://fdt.secretlab.ca
 +T:    git git://git.secretlab.ca/git/linux-2.6.git
  S:    Maintained
  F:    drivers/of
  F:    include/linux/of*.h
@@@ -4630,12 -4633,6 +4637,12 @@@ M:    Robert Jarzmik <robert.jarzmik@free.
  L:    rtc-linux@googlegroups.com
  S:    Maintained
  
 +QLOGIC QLA1280 SCSI DRIVER
 +M:    Michael Reed <mdr@sgi.com>
 +L:    linux-scsi@vger.kernel.org
 +S:    Maintained
 +F:    drivers/scsi/qla1280.[ch]
 +
  QLOGIC QLA2XXX FC-SCSI DRIVER
  M:    Andrew Vasquez <andrew.vasquez@qlogic.com>
  M:    linux-driver@qlogic.com
@@@ -5394,7 -5391,6 +5401,7 @@@ M:      David Brownell <dbrownell@users.sour
  M:    Grant Likely <grant.likely@secretlab.ca>
  L:    spi-devel-general@lists.sourceforge.net
  Q:    http://patchwork.kernel.org/project/spi-devel-general/list/
 +T:    git git://git.secretlab.ca/git/linux-2.6.git
  S:    Maintained
  F:    Documentation/spi/
  F:    drivers/spi/