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

Pull EDAC fixes and ghes-edac from Mauro Carvalho Chehab:
 "For:

   - Some fixes at edac drivers (i7core_edac, sb_edac, i3200_edac);
   - error injection support for i5100, when EDAC debug is enabled;
   - fix edac when it is loaded builtin (early init for the subsystem);
   - a "Firmware First" EDAC driver, allowing ghes to report errors via
     EDAC (ghes-edac).

  With regards to ghes-edac, this fixes a longstanding BZ at Red Hat
  that happens with Nehalem and Sandy Bridge CPUs: when both GHES and
  i7core_edac or sb_edac are running, the error reports are
  unpredictable, as both BIOS and OS race to access the registers.  With
  ghes-edac, the EDAC core will refuse to register any other concurrent
  memory error driver.

  This patchset moves the ghes struct definitions to a separate header
  file (include/acpi/ghes.h) and adds 3 hooks at apei/ghes.c to
  register/unregister and to report errors via ghes-edac.  Those changes
  were acked by ghes driver maintainer (Huang)."

* 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac: (30 commits)
  i5100_edac: convert to use simple_open()
  ghes_edac: fix to use list_for_each_entry_safe() when delete list items
  ghes_edac: Fix RAS tracing
  ghes_edac: Make it compliant with UEFI spec 2.3.1
  ghes_edac: Improve driver's printk messages
  ghes_edac: Don't credit the same memory dimm twice
  ghes_edac: do a better job of filling EDAC DIMM info
  ghes_edac: add support for reporting errors via EDAC
  ghes_edac: Register at EDAC core the BIOS report
  ghes: add the needed hooks for EDAC error report
  ghes: move structures/enum to a header file
  edac: add support for error type "Info"
  edac: add support for raw error reports
  edac: reduce stack pressure by using a pre-allocated buffer
  edac: lock module owner to avoid error report conflicts
  edac: remove proc_name from mci structure
  edac: add a new memory layer type
  edac: initialize the core earlier
  edac: better report error conditions in debug mode
  i5100_edac: Remove two checkpatch warnings
  ...

diff --combined MAINTAINERS
index c7b9b2bf8a0a6e40b4167a8213fbe6d88b2b9747,889644d9772b64b0501da44f6274a1eb6c9b9873..6db1c6bdf0150fbeba1606f4090f1c3d7afcd2dd
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -97,13 -97,12 +97,13 @@@ Descriptions of section entries
           X:   net/ipv6/
           matches all files in and below net excluding net/ipv6/
        K: Keyword perl extended regex pattern to match content in a
 -         patch or file.  For instance:
 +         patch or file, or an affected filename.  For instance:
           K: of_get_profile
 -            matches patches or files that contain "of_get_profile"
 +            matches patch or file content, or filenames, that contain
 +            "of_get_profile"
           K: \b(printk|pr_(info|err))\b
 -            matches patches or files that contain one or more of the words
 -            printk, pr_info or pr_err
 +            matches patch or file content, or filenames, that contain one or
 +            more of the words printk, pr_info or pr_err
           One regex pattern per line.  Multiple K: lines acceptable.
  
  Note: For the hard of thinking, this list is meant to remain in alphabetical
@@@ -466,14 -465,6 +466,14 @@@ S:       Maintaine
  F:    drivers/scsi/aic7xxx/
  F:    drivers/scsi/aic7xxx_old/
  
 +AIMSLAB FM RADIO RECEIVER DRIVER
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/radio/radio-aimslab*
 +
  AIO
  M:    Benjamin LaHaise <bcrl@kvack.org>
  L:    linux-aio@kvack.org
@@@ -568,18 -559,6 +568,18 @@@ L:       linux-rdma@vger.kernel.or
  S:    Maintained
  F:    drivers/infiniband/hw/amso1100/
  
 +ANALOG DEVICES INC AD9389B DRIVER
 +M:    Hans Verkuil <hans.verkuil@cisco.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/i2c/ad9389b*
 +
 +ANALOG DEVICES INC ADV7604 DRIVER
 +M:    Hans Verkuil <hans.verkuil@cisco.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/i2c/adv7604*
 +
  ANALOG DEVICES INC ASOC CODEC DRIVERS
  M:    Lars-Peter Clausen <lars@metafoo.de>
  L:    device-drivers-devel@blackfin.uclinux.org
@@@ -691,16 -670,8 +691,16 @@@ F:       drivers/input/serio/ambakmi.
  F:    include/linux/amba/kmi.h
  
  ARM PRIMECELL MMCI PL180/1 DRIVER
 -S:    Orphan
 +M:    Russell King <linux@arm.linux.org.uk>
 +S:    Maintained
  F:    drivers/mmc/host/mmci.*
 +F:    include/linux/amba/mmci.h
 +
 +ARM PRIMECELL UART PL010 AND PL011 DRIVERS
 +M:    Russell King <linux@arm.linux.org.uk>
 +S:    Maintained
 +F:    drivers/tty/serial/amba-pl01*.c
 +F:    include/linux/amba/serial.h
  
  ARM PRIMECELL BUS SUPPORT
  M:    Russell King <linux@arm.linux.org.uk>
@@@ -1147,14 -1118,6 +1147,14 @@@ F:    arch/arm/mach-s5pv210/mach-goni.
  F:    arch/arm/mach-exynos/mach-universal_c210.c
  F:    arch/arm/mach-exynos/mach-nuri.c
  
 +ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT
 +M:    Kyungmin Park <kyungmin.park@samsung.com>
 +M:    Kamil Debski <k.debski@samsung.com>
 +L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/platform/s5p-g2d/
 +
  ARM/SAMSUNG S5P SERIES FIMC SUPPORT
  M:    Kyungmin Park <kyungmin.park@samsung.com>
  M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
@@@ -1285,17 -1248,12 +1285,17 @@@ M:   Tony Prisk <linux@prisktech.co.nz
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-vt8500/
 +F:    drivers/clocksource/vt8500_timer.c
 +F:    drivers/gpio/gpio-vt8500.c
 +F:    drivers/mmc/host/wmt-sdmmc.c
 +F:    drivers/pwm/pwm-vt8500.c
 +F:    drivers/rtc/rtc-vt8500.c
 +F:    drivers/tty/serial/vt8500_serial.c
 +F:    drivers/usb/host/ehci-vt8500.c
 +F:    drivers/usb/host/uhci-platform.c
  F:    drivers/video/vt8500lcdfb.*
  F:    drivers/video/wm8505fb*
  F:    drivers/video/wmt_ge_rops.*
 -F:    drivers/tty/serial/vt8500_serial.c
 -F:    drivers/rtc/rtc-vt8500.c
 -F:    drivers/mmc/host/wmt-sdmmc.c
  
  ARM/ZIPIT Z2 SUPPORT
  M:    Marek Vasut <marek.vasut@gmail.com>
@@@ -1304,14 -1262,6 +1304,14 @@@ S:    Maintaine
  F:    arch/arm/mach-pxa/z2.c
  F:    arch/arm/mach-pxa/include/mach/z2.h
  
 +ARM/ZYNQ ARCHITECTURE
 +M:    Michal Simek <michal.simek@xilinx.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +W:    http://wiki.xilinx.com
 +T:    git git://git.xilinx.com/linux-xlnx.git
 +S:    Supported
 +F:    arch/arm/mach-zynq/
 +
  ARM64 PORT (AARCH64 ARCHITECTURE)
  M:    Catalin Marinas <catalin.marinas@arm.com>
  M:    Will Deacon <will.deacon@arm.com>
@@@ -1320,14 -1270,6 +1320,14 @@@ S:    Maintaine
  F:    arch/arm64/
  F:    Documentation/arm64/
  
 +AS3645A LED FLASH CONTROLLER DRIVER
 +M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/as3645a.c
 +F:    include/media/as3645a.h
 +
  ASC7621 HARDWARE MONITOR DRIVER
  M:    George Joseph <george.joseph@fairview5.com>
  L:    lm-sensors@lm-sensors.org
@@@ -1361,7 -1303,7 +1361,7 @@@ F:      include/linux/dmaengine.
  F:    include/linux/async_tx.h
  
  AT24 EEPROM DRIVER
 -M:    Wolfram Sang <w.sang@pengutronix.de>
 +M:    Wolfram Sang <wsa@the-dreams.de>
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
  F:    drivers/misc/eeprom/at24.c
@@@ -1575,14 -1517,6 +1575,14 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/usb/dvb-usb-v2/az6007.c
  
 +AZTECH FM RADIO RECEIVER DRIVER
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/radio/radio-aztech*
 +
  B43 WIRELESS DRIVER
  M:    Stefano Brivio <stefano.brivio@polimi.it>
  L:    linux-wireless@vger.kernel.org
@@@ -1682,15 -1616,6 +1682,15 @@@ W:    http://blackfin.uclinux.org
  S:    Supported
  F:    drivers/i2c/busses/i2c-bfin-twi.c
  
 +BLACKFIN MEDIA DRIVER
 +M:    Scott Jiang <scott.jiang.linux@gmail.com>
 +L:    uclinux-dist-devel@blackfin.uclinux.org
 +W:    http://blackfin.uclinux.org/
 +S:    Supported
 +F:    drivers/media/platform/blackfin/
 +F:    drivers/media/i2c/adv7183*
 +F:    drivers/media/i2c/vs6624*
 +
  BLINKM RGB LED DRIVER
  M:    Jan-Simon Moeller <jansimon.moeller@gmx.de>
  S:    Maintained
@@@ -1800,8 -1725,7 +1800,8 @@@ F:      drivers/bcma
  F:    include/linux/bcma/
  
  BROCADE BFA FC SCSI DRIVER
 -M:    Krishna C Gudipati <kgudipat@brocade.com>
 +M:    Anil Gurumurthy <agurumur@brocade.com>
 +M:    Vijaya Mohan Guvva <vmohan@brocade.com>
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  F:    drivers/scsi/bfa/
@@@ -1875,14 -1799,6 +1875,14 @@@ S:    Supporte
  F:    Documentation/filesystems/caching/cachefiles.txt
  F:    fs/cachefiles/
  
 +CADET FM/AM RADIO RECEIVER DRIVER
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/radio/radio-cadet*
 +
  CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER
  M:    Jonathan Corbet <corbet@lwn.net>
  L:    linux-media@vger.kernel.org
@@@ -2019,8 -1935,7 +2019,8 @@@ F:      drivers/misc/
  
  CHECKPATCH
  M:    Andy Whitcroft <apw@canonical.com>
 -S:    Supported
 +M:    Joe Perches <joe@perches.com>
 +S:    Maintained
  F:    scripts/checkpatch.pl
  
  CHINESE DOCUMENTATION
@@@ -2075,8 -1990,8 +2075,8 @@@ S:      Maintaine
  F:    include/linux/clk.h
  
  CISCO FCOE HBA DRIVER
 -M:    Abhijeet Joglekar <abjoglek@cisco.com>
 -M:    Venkata Siva Vijayendra Bhamidipati <vbhamidi@cisco.com>
 +M:    Hiral Patel <hiralpat@cisco.com>
 +M:    Suma Ramars <sramars@cisco.com>
  M:    Brian Uchino <buchino@cisco.com>
  L:    linux-scsi@vger.kernel.org
  S:    Supported
@@@ -2225,10 -2140,10 +2225,10 @@@ S:   Maintaine
  F:    tools/power/cpupower
  
  CPUSETS
 -M:    Paul Menage <paul@paulmenage.org>
 +M:    Li Zefan <lizefan@huawei.com>
  W:    http://www.bullopensource.org/cpuset/
  W:    http://oss.sgi.com/projects/cpusets/
 -S:    Supported
 +S:    Maintained
  F:    Documentation/cgroups/cpusets.txt
  F:    include/linux/cpuset.h
  F:    kernel/cpuset.c
@@@ -2284,15 -2199,6 +2284,15 @@@ F:    Documentation/video4linux/cx18.tx
  F:    drivers/media/pci/cx18/
  F:    include/uapi/linux/ivtv*
  
 +CX2341X MPEG ENCODER HELPER MODULE
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/i2c/cx2341x*
 +F:    include/media/cx2341x*
 +
  CX88 VIDEO4LINUX DRIVER
  M:    Mauro Carvalho Chehab <mchehab@redhat.com>
  L:    linux-media@vger.kernel.org
@@@ -2670,13 -2576,6 +2670,13 @@@ S:    Maintaine
  F:    drivers/gpu/drm/tegra/
  F:    Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
  
 +DSBR100 USB FM RADIO DRIVER
 +M:    Alexey Klimov <klimov.linux@gmail.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/radio/dsbr100.c
 +
  DSCC4 DRIVER
  M:    Francois Romieu <romieu@fr.zoreil.com>
  L:    netdev@vger.kernel.org
@@@ -2904,6 -2803,13 +2904,13 @@@ W:    bluesmoke.sourceforge.ne
  S:    Maintained
  F:    drivers/edac/e7xxx_edac.c
  
+ EDAC-GHES
+ M:    Mauro Carvalho Chehab <mchehab@redhat.com>
+ L:    linux-edac@vger.kernel.org
+ W:    bluesmoke.sourceforge.net
+ S:    Maintained
+ F:    drivers/edac/ghes-edac.c
+ 
  EDAC-I82443BXGX
  M:    Tim Small <tim@buttersideup.com>
  L:    linux-edac@vger.kernel.org
@@@ -3075,6 -2981,11 +3082,6 @@@ S:     Maintaine
  F:    include/linux/netfilter_bridge/
  F:    net/bridge/
  
 -ETHERTEAM 16I DRIVER
 -M:    Mika Kuoppala <miku@iki.fi>
 -S:    Maintained
 -F:    drivers/net/ethernet/fujitsu/eth16i.c
 -
  EXT2 FILE SYSTEM
  M:    Jan Kara <jack@suse.cz>
  L:    linux-ext4@vger.kernel.org
@@@ -3443,14 -3354,6 +3450,14 @@@ W:    http://www.icp-vortex.com
  S:    Supported
  F:    drivers/scsi/gdt*
  
 +GEMTEK FM RADIO RECEIVER DRIVER
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/radio/radio-gemtek*
 +
  GENERIC GPIO I2C DRIVER
  M:    Haavard Skinnemoen <hskinnemoen@gmail.com>
  S:    Supported
@@@ -3854,13 -3757,6 +3861,13 @@@ F:    drivers/i2c/busses/i2c-sis96x.
  F:    drivers/i2c/busses/i2c-via.c
  F:    drivers/i2c/busses/i2c-viapro.c
  
 +I2C/SMBUS ISMT DRIVER
 +M:    Seth Heasley <seth.heasley@intel.com>
 +M:    Neil Horman <nhorman@tuxdriver.com>
 +L:    linux-i2c@vger.kernel.org
 +F:    drivers/i2c/busses/i2c-ismt.c
 +F:    Documentation/i2c/busses/i2c-ismt
 +
  I2C/SMBUS STUB DRIVER
  M:    "Mark M. Hoffman" <mhoffman@lightlink.com>
  L:    linux-i2c@vger.kernel.org
@@@ -3868,11 -3764,12 +3875,11 @@@ S:   Maintaine
  F:    drivers/i2c/i2c-stub.c
  
  I2C SUBSYSTEM
 -M:    Wolfram Sang <w.sang@pengutronix.de>
 +M:    Wolfram Sang <wsa@the-dreams.de>
  M:    "Ben Dooks (embedded platforms)" <ben-linux@fluff.org>
  L:    linux-i2c@vger.kernel.org
  W:    http://i2c.wiki.kernel.org/
 -T:    quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
 -T:    git git://git.pengutronix.de/git/wsa/linux.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
  S:    Maintained
  F:    Documentation/i2c/
  F:    drivers/i2c/
@@@ -4326,7 -4223,6 +4333,7 @@@ M:      Thomas Gleixner <tglx@linutronix.de
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
  F:    kernel/irq/
 +F:    drivers/irqchip/
  
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
  M:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
@@@ -4344,14 -4240,6 +4351,14 @@@ F:    Documentation/isapnp.tx
  F:    drivers/pnp/isapnp/
  F:    include/linux/isapnp.h
  
 +ISA RADIO MODULE
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/radio/radio-isa*
 +
  iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
  M:    Peter Jones <pjones@redhat.com>
  M:    Konrad Rzeszutek Wilk <konrad@kernel.org>
@@@ -4510,14 -4398,6 +4517,14 @@@ W:    http://lse.sourceforge.net/kdump
  S:    Maintained
  F:    Documentation/kdump/
  
 +KEENE FM RADIO TRANSMITTER DRIVER
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/radio/radio-keene*
 +
  KERNEL AUTOMOUNTER v4 (AUTOFS4)
  M:    Ian Kent <raven@themaw.net>
  L:    autofs@vger.kernel.org
@@@ -4608,15 -4488,6 +4615,15 @@@ F:    arch/s390/include/asm/kvm
  F:    arch/s390/kvm/
  F:    drivers/s390/kvm/
  
 +KERNEL VIRTUAL MACHINE (KVM) FOR ARM
 +M:    Christoffer Dall <cdall@cs.columbia.edu>
 +L:    kvmarm@lists.cs.columbia.edu
 +W:    http://systems.cs.columbia.edu/projects/kvm-arm
 +S:    Maintained
 +F:    arch/arm/include/uapi/asm/kvm*
 +F:    arch/arm/include/asm/kvm*
 +F:    arch/arm/kvm/
 +
  KEXEC
  M:    Eric Biederman <ebiederm@xmission.com>
  W:    http://kernel.org/pub/linux/utils/kernel/kexec/
@@@ -5005,13 -4876,6 +5012,13 @@@ Q:    http://patchwork.linuxtv.org/project
  S:    Maintained
  F:    drivers/media/dvb-frontends/m88rs2000*
  
 +MA901 MASTERKIT USB FM RADIO DRIVER
 +M:      Alexey Klimov <klimov.linux@gmail.com>
 +L:      linux-media@vger.kernel.org
 +T:      git git://linuxtv.org/media_tree.git
 +S:      Maintained
 +F:      drivers/media/radio/radio-ma901.c
 +
  MAC80211
  M:    Johannes Berg <johannes@sipsolutions.net>
  L:    linux-wireless@vger.kernel.org
@@@ -5109,14 -4973,6 +5116,14 @@@ S:    Maintaine
  F:    Documentation/hwmon/max6650
  F:    drivers/hwmon/max6650.c
  
 +MAXIRADIO FM RADIO RECEIVER DRIVER
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/radio/radio-maxiradio*
 +
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
  M:    Mauro Carvalho Chehab <mchehab@redhat.com>
  P:    LinuxTV.org Project
@@@ -5139,14 -4995,6 +5146,14 @@@ F:    include/uapi/linux/meye.
  F:    include/uapi/linux/ivtv*
  F:    include/uapi/linux/uvcvideo.h
  
 +MEDIAVISION PRO MOVIE STUDIO DRIVER
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Odd Fixes
 +F:    drivers/media/parport/pms*
 +
  MEGARAID SCSI DRIVERS
  M:    Neela Syam Kolli <megaraidlinux@lsi.com>
  L:    linux-scsi@vger.kernel.org
@@@ -5169,10 -5017,6 +5176,10 @@@ L:    linux-mm@kvack.or
  W:    http://www.linux-mm.org
  S:    Maintained
  F:    include/linux/mm.h
 +F:    include/linux/gfp.h
 +F:    include/linux/mmzone.h
 +F:    include/linux/memory_hotplug.h
 +F:    include/linux/vmalloc.h
  F:    mm/
  
  MEMORY RESOURCE CONTROLLER
@@@ -5220,14 -5064,6 +5227,14 @@@ S:    Supporte
  F:    Documentation/mips/
  F:    arch/mips/
  
 +MIROSOUND PCM20 FM RADIO RECEIVER DRIVER
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Odd Fixes
 +F:    drivers/media/radio/radio-miropcm20*
 +
  MODULE SUPPORT
  M:    Rusty Russell <rusty@rustcorp.com.au>
  S:    Maintained
@@@ -5266,38 -5102,6 +5273,38 @@@ L:    platform-driver-x86@vger.kernel.or
  S:    Supported
  F:    drivers/platform/x86/msi-wmi.c
  
 +MT9M032 SENSOR DRIVER
 +M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/mt9m032.c
 +F:    include/media/mt9m032.h
 +
 +MT9P031 SENSOR DRIVER
 +M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/mt9p031.c
 +F:    include/media/mt9p031.h
 +
 +MT9T001 SENSOR DRIVER
 +M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/mt9t001.c
 +F:    include/media/mt9t001.h
 +
 +MT9V032 SENSOR DRIVER
 +M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/mt9v032.c
 +F:    include/media/mt9v032.h
 +
  MULTIFUNCTION DEVICES (MFD)
  M:    Samuel Ortiz <sameo@linux.intel.com>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git
@@@ -5439,7 -5243,6 +5446,7 @@@ F:      net/netrom
  NETWORK BLOCK DEVICE (NBD)
  M:    Paul Clements <Paul.Clements@steeleye.com>
  S:    Maintained
 +L:    nbd-general@lists.sourceforge.net
  F:    Documentation/blockdev/nbd.txt
  F:    drivers/block/nbd.c
  F:    include/linux/nbd.h
@@@ -5573,6 -5376,13 +5580,6 @@@ F:     include/linux/sunrpc
  F:    include/uapi/linux/nfs*
  F:    include/uapi/linux/sunrpc/
  
 -NI5010 NETWORK DRIVER
 -M:    Jan-Pascal van Best <janpascal@vanbest.org>
 -M:    Andreas Mohr <andi@lisas.de>
 -L:    netdev@vger.kernel.org
 -S:    Maintained
 -F:    drivers/net/ethernet/racal/ni5010.*
 -
  NILFS2 FILESYSTEM
  M:    KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp>
  L:    linux-nilfs@vger.kernel.org
@@@ -5598,13 -5408,6 +5605,13 @@@ S:    Maintaine
  F:    Documentation/scsi/NinjaSCSI.txt
  F:    drivers/scsi/nsp32*
  
 +NTB DRIVER
 +M:    Jon Mason <jon.mason@intel.com>
 +S:    Supported
 +F:    drivers/ntb/
 +F:    drivers/net/ntb_netdev.c
 +F:    include/linux/ntb.h
 +
  NTFS FILESYSTEM
  M:    Anton Altaparmakov <anton@tuxera.com>
  L:    linux-ntfs-dev@lists.sourceforge.net
@@@ -5702,7 -5505,7 +5709,7 @@@ S:      Maintaine
  F:    drivers/mmc/host/omap.c
  
  OMAP HS MMC SUPPORT
 -M:    Venkatraman S <svenkatr@ti.com>
 +M:    Balaji T K <balajitk@ti.com>
  L:    linux-mmc@vger.kernel.org
  L:    linux-omap@vger.kernel.org
  S:    Maintained
@@@ -5982,6 -5785,15 +5989,6 @@@ L:     linux-i2c@vger.kernel.or
  S:    Maintained
  F:    drivers/i2c/muxes/i2c-mux-pca9541.c
  
 -PCA9564/PCA9665 I2C BUS DRIVER
 -M:    Wolfram Sang <w.sang@pengutronix.de>
 -L:    linux-i2c@vger.kernel.org
 -S:    Maintained
 -F:    drivers/i2c/algos/i2c-algo-pca.c
 -F:    drivers/i2c/busses/i2c-pca-*
 -F:    include/linux/i2c-algo-pca.h
 -F:    include/linux/i2c-pca-platform.h
 -
  PCDP - PRIMARY CONSOLE AND DEBUG PORT
  M:    Khalid Aziz <khalid@gonehiking.org>
  S:    Maintained
@@@ -6450,14 -6262,6 +6457,14 @@@ L:    linux-hexagon@vger.kernel.or
  S:    Supported
  F:    arch/hexagon/
  
 +QUICKCAM PARALLEL PORT WEBCAMS
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Odd Fixes
 +F:    drivers/media/parport/*-qcam*
 +
  RADOS BLOCK DEVICE (RBD)
  M:    Yehuda Sadeh <yehuda@inktank.com>
  M:    Sage Weil <sage@inktank.com>
@@@ -6515,12 -6319,6 +6522,12 @@@ S:    Maintaine
  F:    Documentation/blockdev/ramdisk.txt
  F:    drivers/block/brd.c
  
 +RAMSAM DRIVER (IBM RamSan 70/80 PCI SSD Flash Card)
 +M:    Joshua Morris <josh.h.morris@us.ibm.com>
 +M:    Philip Kelleher <pjk1939@linux.vnet.ibm.com>
 +S:    Maintained
 +F:    drivers/block/rsxx/
 +
  RANDOM NUMBER DRIVER
  M:    Theodore Ts'o" <tytso@mit.edu>
  S:    Maintained
@@@ -6707,7 -6505,7 +6714,7 @@@ S:      Supporte
  F:    drivers/s390/net/
  
  S390 ZCRYPT DRIVER
 -M:    Holger Dengler <hd@linux.vnet.ibm.com>
 +M:    Ingo Tuchscherer <ingo.tuchscherer@de.ibm.com>
  M:    linux390@de.ibm.com
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -6738,14 -6536,6 +6745,14 @@@ L:    linux-arm-kernel@lists.infradead.or
  S:    Supported
  F:    drivers/mmc/host/s3cmci.*
  
 +SAA6588 RDS RECEIVER DRIVER
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Odd Fixes
 +F:    drivers/media/i2c/saa6588*
 +
  SAA7134 VIDEO4LINUX DRIVER
  M:    Mauro Carvalho Chehab <mchehab@redhat.com>
  L:    linux-media@vger.kernel.org
@@@ -6756,9 -6546,10 +6763,9 @@@ F:     Documentation/video4linux/saa7134
  F:    drivers/media/pci/saa7134/
  
  SAA7146 VIDEO4LINUX-2 DRIVER
 -M:    Michael Hunold <michael@mihu.de>
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://www.mihu.de/linux/saa7146
  S:    Maintained
  F:    drivers/media/common/saa7146/
  F:    drivers/media/pci/saa7146/
@@@ -6800,13 -6591,6 +6807,13 @@@ S:    Maintaine
  F:    drivers/media/platform/s3c-camif/
  F:    include/media/s3c_camif.h
  
 +SAMSUNG S5C73M3 CAMERA DRIVER
 +M:    Kyungmin Park <kyungmin.park@samsung.com>
 +M:    Andrzej Hajda <a.hajda@samsung.com>
 +L:    linux-media@vger.kernel.org
 +S:    Supported
 +F:    drivers/media/i2c/s5c73m3/*
 +
  SERIAL DRIVERS
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  L:    linux-serial@vger.kernel.org
@@@ -6820,16 -6604,8 +6827,16 @@@ F:    include/linux/dw_dmac.
  F:    drivers/dma/dw_dmac_regs.h
  F:    drivers/dma/dw_dmac.c
  
 +SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER
 +M:    Seungwon Jeon <tgih.jun@samsung.com>
 +M:    Jaehoon Chung <jh80.chung@samsung.com>
 +L:    linux-mmc@vger.kernel.org
 +S:    Maintained
 +F:    include/linux/mmc/dw_mmc.h
 +F:    drivers/mmc/host/dw_mmc*
 +
  TIMEKEEPING, NTP
 -M:    John Stultz <johnstul@us.ibm.com>
 +M:    John Stultz <john.stultz@linaro.org>
  M:    Thomas Gleixner <tglx@linutronix.de>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
  S:    Supported
@@@ -7051,8 -6827,7 +7058,8 @@@ S:      Supporte
  F:    drivers/net/ethernet/sfc/
  
  SGI GRU DRIVER
 -M:    Jack Steiner <steiner@sgi.com>
 +M:    Dimitri Sivanich <sivanich@sgi.com>
 +M:    Robin Holt <holt@sgi.com>
  S:    Maintained
  F:    drivers/misc/sgi-gru/
  
@@@ -7076,38 -6851,6 +7083,38 @@@ M:    Robin Holt <holt@sgi.com
  S:    Maintained
  F:    drivers/misc/sgi-xp/
  
 +SI470X FM RADIO RECEIVER I2C DRIVER
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Odd Fixes
 +F:    drivers/media/radio/si470x/radio-si470x-i2c.c
 +
 +SI470X FM RADIO RECEIVER USB DRIVER
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/radio/si470x/radio-si470x-common.c
 +F:    drivers/media/radio/si470x/radio-si470x.h
 +F:    drivers/media/radio/si470x/radio-si470x-usb.c
 +
 +SH_VEU V4L2 MEM2MEM DRIVER
 +M:    Guennadi Liakhovetski <g.liakhovetski@gmx.de>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/platform/sh_veu.c
 +F:    include/media/sh_veu.h
 +
 +SH_VOU V4L2 OUTPUT DRIVER
 +M:    Guennadi Liakhovetski <g.liakhovetski@gmx.de>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/platform/sh_vou.c
 +F:    include/media/sh_vou.h
 +
  SIMPLE FIRMWARE INTERFACE (SFI)
  M:    Len Brown <lenb@kernel.org>
  L:    sfi-devel@simplefirmware.org
@@@ -7279,6 -7022,14 +7286,6 @@@ L:     linux-fbdev@vger.kernel.or
  S:    Maintained
  F:    drivers/video/smscufx.c
  
 -SN-IA64 (Itanium) SUB-PLATFORM
 -M:    Jes Sorensen <jes@sgi.com>
 -L:    linux-altix@sgi.com
 -L:    linux-ia64@vger.kernel.org
 -W:    http://www.sgi.com/altix
 -S:    Maintained
 -F:    arch/ia64/sn/
 -
  SOC-CAMERA V4L2 SUBSYSTEM
  M:    Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  L:    linux-media@vger.kernel.org
@@@ -7434,7 -7185,6 +7441,7 @@@ F:      drivers/clk/spear
  
  SPI SUBSYSTEM
  M:    Grant Likely <grant.likely@secretlab.ca>
 +M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
  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
@@@ -7548,7 -7298,6 +7555,7 @@@ STAGING - NVIDIA COMPLIANT EMBEDDED CON
  M:    Julian Andres Klode <jak@jak-linux.org>
  M:    Marc Dietrich <marvin24@gmx.de>
  L:    ac100@lists.launchpad.net (moderated for non-subscribers)
 +L:    linux-tegra@vger.kernel.org
  S:    Maintained
  F:    drivers/staging/nvec/
  
@@@ -7561,7 -7310,8 +7568,7 @@@ S:      Odd Fixe
  F:    drivers/staging/olpc_dcon/
  
  STAGING - OZMO DEVICES USB OVER WIFI DRIVER
 -M:    Rupesh Gujare <rgujare@ozmodevices.com>
 -M:    Chris Kelly <ckelly@ozmodevices.com>
 +M:    Rupesh Gujare <rupesh.gujare@atmel.com>
  S:    Maintained
  F:    drivers/staging/ozwpan/
  
@@@ -7776,14 -7526,6 +7783,14 @@@ T:    git git://linuxtv.org/mkrufky/tuners
  S:    Maintained
  F:    drivers/media/tuners/tda8290.*
  
 +TDA9840 MEDIA DRIVER
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/i2c/tda9840*
 +
  TEA5761 TUNER DRIVER
  M:    Mauro Carvalho Chehab <mchehab@redhat.com>
  L:    linux-media@vger.kernel.org
@@@ -7800,35 -7542,14 +7807,35 @@@ T:   git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/tuners/tea5767.*
  
 +TEA6415C MEDIA DRIVER
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/i2c/tea6415c*
 +
 +TEA6420 MEDIA DRIVER
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/i2c/tea6420*
 +
  TEAM DRIVER
 -M:    Jiri Pirko <jpirko@redhat.com>
 +M:    Jiri Pirko <jiri@resnulli.us>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/net/team/
  F:    include/linux/if_team.h
  F:    include/uapi/linux/if_team.h
  
 +TECHNOLOGIC SYSTEMS TS-5500 PLATFORM SUPPORT
 +M:    Savoir-faire Linux Inc. <kernel@savoirfairelinux.com>
 +S:    Maintained
 +F:    arch/x86/platform/ts5500/
 +
  TECHNOTREND USB IR RECEIVER
  M:    Sean Young <sean@mess.org>
  L:    linux-media@vger.kernel.org
@@@ -7841,7 -7562,9 +7848,7 @@@ L:      linux-tegra@vger.kernel.or
  Q:    http://patchwork.ozlabs.org/project/linux-tegra/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
  S:    Supported
 -F:    arch/arm/mach-tegra
 -F:    arch/arm/boot/dts/tegra*
 -F:    arch/arm/configs/tegra_defconfig
 +K:    (?i)[^a-z]tegra
  
  TEHUTI ETHERNET DRIVER
  M:    Andy Gospodarek <andy@greyhouse.net>
@@@ -7869,11 -7592,6 +7876,11 @@@ S:      Supporte
  F:      drivers/thermal/
  F:      include/linux/thermal.h
  
 +THINGM BLINK(1) USB RGB LED DRIVER
 +M:    Vivien Didelot <vivien.didelot@savoirfairelinux.com>
 +S:    Maintained
 +F:    drivers/hid/hid-thingm.c
 +
  THINKPAD ACPI EXTRAS DRIVER
  M:    Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
  L:    ibm-acpi-devel@lists.sourceforge.net
@@@ -7906,22 -7624,6 +7913,22 @@@ F:    Documentation/backlight/lp855x-drive
  F:    drivers/video/backlight/lp855x_bl.c
  F:    include/linux/platform_data/lp855x.h
  
 +TI LP8727 CHARGER DRIVER
 +M:    Milo Kim <milo.kim@ti.com>
 +S:    Maintained
 +F:    drivers/power/lp8727_charger.c
 +F:    include/linux/platform_data/lp8727.h
 +
 +TI LP8788 MFD DRIVER
 +M:    Milo Kim <milo.kim@ti.com>
 +S:    Maintained
 +F:    drivers/iio/adc/lp8788_adc.c
 +F:    drivers/leds/leds-lp8788.c
 +F:    drivers/mfd/lp8788*.c
 +F:    drivers/power/lp8788-charger.c
 +F:    drivers/regulator/lp8788-*.c
 +F:    include/linux/mfd/lp8788*.h
 +
  TI TWL4030 SERIES SOC CODEC DRIVER
  M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -8216,10 -7918,9 +8223,10 @@@ F:    drivers/net/wireless/ath/ar5523
  USB ATTACHED SCSI
  M:    Matthew Wilcox <willy@linux.intel.com>
  M:    Sarah Sharp <sarah.a.sharp@linux.intel.com>
 +M:    Gerd Hoffmann <kraxel@redhat.com>
  L:    linux-usb@vger.kernel.org
  L:    linux-scsi@vger.kernel.org
 -S:    Supported
 +S:    Maintained
  F:    drivers/usb/storage/uas.c
  
  USB CDC ETHERNET DRIVER
@@@ -8463,14 -8164,6 +8470,14 @@@ S:    Maintaine
  F:    drivers/media/usb/uvc/
  F:    include/uapi/linux/uvcvideo.h
  
 +USB VISION DRIVER
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Odd Fixes
 +F:    drivers/media/usb/usbvision/
 +
  USB WEBCAM GADGET
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-usb@vger.kernel.org
@@@ -8620,14 -8313,6 +8627,14 @@@ L:    netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/net/ethernet/via/via-velocity.*
  
 +VIVI VIRTUAL VIDEO DRIVER
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/platform/vivi*
 +
  VLAN (802.1Q)
  M:    Patrick McHardy <kaber@trash.net>
  L:    netdev@vger.kernel.org

diff --combined drivers/edac/Kconfig
index acb709bfac0fea2aed419aab4d96fd0b1eae731c,7e38e5e576e879707974c156bbaec6a7dc78c7b5..e443f2c1dfd1685ab0bcf88be945e898a5373a55
--- 1/drivers/edac/Kconfig
--- 2/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@@ -80,6 -80,29 +80,29 @@@ config EDAC_MM_EDA
          occurred so that a particular failing memory module can be
          replaced.  If unsure, select 'Y'.
  
+ config EDAC_GHES
+       bool "Output ACPI APEI/GHES BIOS detected errors via EDAC"
+       depends on ACPI_APEI_GHES && (EDAC_MM_EDAC=y)
+       default y
+       help
+         Not all machines support hardware-driven error report. Some of those
+         provide a BIOS-driven error report mechanism via ACPI, using the
+         APEI/GHES driver. By enabling this option, the error reports provided
+         by GHES are sent to userspace via the EDAC API.
+ 
+         When this option is enabled, it will disable the hardware-driven
+         mechanisms, if a GHES BIOS is detected, entering into the
+         "Firmware First" mode.
+ 
+         It should be noticed that keeping both GHES and a hardware-driven
+         error mechanism won't work well, as BIOS will race with OS, while
+         reading the error registers. So, if you want to not use "Firmware
+         first" GHES error mechanism, you should disable GHES either at
+         compilation time or by passing "ghes.disable=1" Kernel parameter
+         at boot time.
+ 
+         In doubt, say 'Y'.
+ 
  config EDAC_AMD64
        tristate "AMD64 (Opteron, Athlon64) K8, F10h"
        depends on EDAC_MM_EDAC && AMD_NB && X86_64 && EDAC_DECODE_MCE
@@@ -158,7 -181,7 +181,7 @@@ config EDAC_I300
  
  config EDAC_I3200
        tristate "Intel 3200"
 -      depends on EDAC_MM_EDAC && PCI && X86 && EXPERIMENTAL
 +      depends on EDAC_MM_EDAC && PCI && X86
        help
          Support for error detection and correction on the Intel
          3200 and 3210 server chipsets.
@@@ -224,7 -247,7 +247,7 @@@ config EDAC_I730
  config EDAC_SBRIDGE
        tristate "Intel Sandy-Bridge Integrated MC"
        depends on EDAC_MM_EDAC && PCI && X86_64 && X86_MCE_INTEL
 -      depends on PCI_MMCONFIG && EXPERIMENTAL
 +      depends on PCI_MMCONFIG
        help
          Support for error detection and correction the Intel
          Sandy Bridge Integrated Memory Controller.

diff --combined include/linux/pci_ids.h
index 31717bd287fd9f8f1e2515d8947aa5c5896b21f1,d0d1e801e3509505c97459047b4087442f993559..f11c1c2609d53ded1135b6289845f2ddd5e701da
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -1807,8 -1807,6 +1807,8 @@@
  #define PCI_VENDOR_ID_ESDGMBH         0x12fe
  #define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111
  
 +#define PCI_VENDOR_ID_CB              0x1307  /* Measurement Computing */
 +
  #define PCI_VENDOR_ID_SIIG            0x131f
  #define PCI_SUBVENDOR_ID_SIIG         0x131f
  #define PCI_DEVICE_ID_SIIG_1S_10x_550 0x1000
@@@ -1870,23 -1868,8 +1870,23 @@@
  #define PCI_VENDOR_ID_QUATECH         0x135C
  #define PCI_DEVICE_ID_QUATECH_QSC100  0x0010
  #define PCI_DEVICE_ID_QUATECH_DSC100  0x0020
 +#define PCI_DEVICE_ID_QUATECH_DSC200  0x0030
 +#define PCI_DEVICE_ID_QUATECH_QSC200  0x0040
  #define PCI_DEVICE_ID_QUATECH_ESC100D 0x0050
  #define PCI_DEVICE_ID_QUATECH_ESC100M 0x0060
 +#define PCI_DEVICE_ID_QUATECH_QSCP100 0x0120
 +#define PCI_DEVICE_ID_QUATECH_DSCP100 0x0130
 +#define PCI_DEVICE_ID_QUATECH_QSCP200 0x0140
 +#define PCI_DEVICE_ID_QUATECH_DSCP200 0x0150
 +#define PCI_DEVICE_ID_QUATECH_QSCLP100        0x0170
 +#define PCI_DEVICE_ID_QUATECH_DSCLP100        0x0180
 +#define PCI_DEVICE_ID_QUATECH_DSC100E 0x0181
 +#define PCI_DEVICE_ID_QUATECH_SSCLP100        0x0190
 +#define PCI_DEVICE_ID_QUATECH_QSCLP200        0x01A0
 +#define PCI_DEVICE_ID_QUATECH_DSCLP200        0x01B0
 +#define PCI_DEVICE_ID_QUATECH_DSC200E 0x01B1
 +#define PCI_DEVICE_ID_QUATECH_SSCLP200        0x01C0
 +#define PCI_DEVICE_ID_QUATECH_ESCLP100        0x01E0
  #define PCI_DEVICE_ID_QUATECH_SPPXP_100 0x0278
  
  #define PCI_VENDOR_ID_SEALEVEL                0x135e
@@@ -2030,10 -2013,6 +2030,10 @@@
  #define PCI_DEVICE_ID_CMEDIA_CM8738   0x0111
  #define PCI_DEVICE_ID_CMEDIA_CM8738B  0x0112
  
 +#define PCI_VENDOR_ID_ADVANTECH               0x13fe
 +
 +#define PCI_VENDOR_ID_MEILHAUS                0x1402
 +
  #define PCI_VENDOR_ID_LAVA            0x1407
  #define PCI_DEVICE_ID_LAVA_DSERIAL    0x0100 /* 2x 16550 */
  #define PCI_DEVICE_ID_LAVA_QUATRO_A   0x0101 /* 2x 16550, half of 4 port */
@@@ -2079,8 -2058,6 +2079,8 @@@
  
  #define PCI_VENDOR_ID_CHELSIO         0x1425
  
 +#define PCI_VENDOR_ID_ADLINK          0x144a
 +
  #define PCI_VENDOR_ID_SAMSUNG         0x144d
  
  #define PCI_VENDOR_ID_GIGABYTE                0x1458
@@@ -2114,8 -2091,6 +2114,8 @@@
  #define PCI_DEVICE_ID_AFAVLAB_P030    0x2182
  #define PCI_SUBDEVICE_ID_AFAVLAB_P061         0x2150
  
 +#define PCI_VENDOR_ID_AMPLICON                0x14dc
 +
  #define PCI_VENDOR_ID_BCM_GVC          0x14a4
  #define PCI_VENDOR_ID_BROADCOM                0x14e4
  #define PCI_DEVICE_ID_TIGON3_5752     0x1600
@@@ -2152,7 -2127,6 +2152,7 @@@
  #define PCI_DEVICE_ID_TIGON3_5754M    0x1672
  #define PCI_DEVICE_ID_TIGON3_5755M    0x1673
  #define PCI_DEVICE_ID_TIGON3_5756     0x1674
 +#define PCI_DEVICE_ID_TIGON3_5750     0x1676
  #define PCI_DEVICE_ID_TIGON3_5751     0x1677
  #define PCI_DEVICE_ID_TIGON3_5715     0x1678
  #define PCI_DEVICE_ID_TIGON3_5715S    0x1679
@@@ -2802,6 -2776,7 +2802,7 @@@
  #define PCI_DEVICE_ID_INTEL_JAKETOWN_UBOX     0x3ce0
  #define PCI_DEVICE_ID_INTEL_IOAT_SNB  0x402f
  #define PCI_DEVICE_ID_INTEL_5100_16   0x65f0
+ #define PCI_DEVICE_ID_INTEL_5100_19   0x65f3
  #define PCI_DEVICE_ID_INTEL_5100_21   0x65f5
  #define PCI_DEVICE_ID_INTEL_5100_22   0x65f6
  #define PCI_DEVICE_ID_INTEL_5400_ERR  0x4030