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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  Revert "HID: magicmouse: ignore 'ivalid report id' while switching modes"
  HID: hid-multitouch: fix broken eGalax
  HID: MAINTAINERS: Update USB HID/HIDBP DRIVERS pattern
  HID: hid-multitouch: add support for Chunghwa multi-touch panel
  HID: hiddev: fix use after free in hiddev_release
  HID: add quirk for HyperPen 10000U
  HID: hiddev: fix potential use-after-free

diff --combined MAINTAINERS
index 6c59eb9,8bd7cae..502f2dd
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -223,8 -223,10 +223,8 @@@ S:        Maintaine
  F:    drivers/platform/x86/acerhdf.c
  
  ACER WMI LAPTOP EXTRAS
 -M:    Carlos Corbacho <carlos@strangeworlds.co.uk>
 -L:    aceracpi@googlegroups.com (subscribers-only)
 +M:    Joey Lee <jlee@novell.com>
  L:    platform-driver-x86@vger.kernel.org
 -W:    http://code.google.com/p/aceracpi
  S:    Maintained
  F:    drivers/platform/x86/acer-wmi.c
  
@@@ -269,8 -271,10 +269,8 @@@ S:        Supporte
  F:    drivers/acpi/video.c
  
  ACPI WMI DRIVER
 -M:    Carlos Corbacho <carlos@strangeworlds.co.uk>
  L:    platform-driver-x86@vger.kernel.org
 -W:    http://www.lesswatts.org/projects/acpi/
 -S:    Maintained
 +S:    Orphan
  F:    drivers/platform/x86/wmi.c
  
  AD1889 ALSA SOUND DRIVER
@@@ -283,35 -287,35 +283,35 @@@ F:      sound/pci/ad1889.
  
  AD525X ANALOG DEVICES DIGITAL POTENTIOMETERS DRIVER
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-driver-devel@blackfin.uclinux.org
 +L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/AD5254
  S:    Supported
  F:    drivers/misc/ad525x_dpot.c
  
  AD5398 CURRENT REGULATOR DRIVER (AD5398/AD5821)
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-driver-devel@blackfin.uclinux.org
 +L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/AD5398
  S:    Supported
  F:    drivers/regulator/ad5398.c
  
  AD714X CAPACITANCE TOUCH SENSOR DRIVER (AD7142/3/7/8/7A)
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-driver-devel@blackfin.uclinux.org
 +L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/AD7142
  S:    Supported
  F:    drivers/input/misc/ad714x.c
  
  AD7877 TOUCHSCREEN DRIVER
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-driver-devel@blackfin.uclinux.org
 +L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/AD7877
  S:    Supported
  F:    drivers/input/touchscreen/ad7877.c
  
  AD7879 TOUCHSCREEN DRIVER (AD7879/AD7889)
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-driver-devel@blackfin.uclinux.org
 +L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/AD7879
  S:    Supported
  F:    drivers/input/touchscreen/ad7879.c
@@@ -337,7 -341,7 +337,7 @@@ F: drivers/net/wireless/adm8211.
  
  ADP5520 BACKLIGHT DRIVER WITH IO EXPANDER (ADP5520/ADP5501)
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-driver-devel@blackfin.uclinux.org
 +L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/ADP5520
  S:    Supported
  F:    drivers/mfd/adp5520.c
@@@ -348,7 -352,7 +348,7 @@@ F: drivers/input/keyboard/adp5520-keys.
  
  ADP5588 QWERTY KEYPAD AND IO EXPANDER DRIVER (ADP5588/ADP5587)
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-driver-devel@blackfin.uclinux.org
 +L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/ADP5588
  S:    Supported
  F:    drivers/input/keyboard/adp5588-keys.c
@@@ -356,7 -360,7 +356,7 @@@ F: drivers/gpio/adp5588-gpio.
  
  ADP8860 BACKLIGHT DRIVER (ADP8860/ADP8861/ADP8863)
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-driver-devel@blackfin.uclinux.org
 +L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/ADP8860
  S:    Supported
  F:    drivers/video/backlight/adp8860_bl.c
@@@ -383,7 -387,7 +383,7 @@@ F: drivers/hwmon/adt7475.
  
  ADXL34X THREE-AXIS DIGITAL ACCELEROMETER DRIVER (ADXL345/ADXL346)
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-driver-devel@blackfin.uclinux.org
 +L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/ADXL345
  S:    Supported
  F:    drivers/input/misc/adxl34x.c
@@@ -479,13 -483,6 +479,13 @@@ F:       drivers/tty/serial/altera_jtaguart.
  F:    include/linux/altera_uart.h
  F:    include/linux/altera_jtaguart.h
  
 +AMD FAM15H PROCESSOR POWER MONITORING DRIVER
 +M:    Andreas Herrmann <andreas.herrmann3@amd.com>
 +L:    lm-sensors@lm-sensors.org
 +S:    Maintained
 +F:    Documentation/hwmon/fam15h_power
 +F:    drivers/hwmon/fam15h_power.c
 +
  AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
  M:    Thomas Dahlmann <dahlmann.thomas@arcor.de>
  L:    linux-geode@lists.infradead.org (moderated for non-subscribers)
@@@ -529,7 -526,7 +529,7 @@@ S: Maintaine
  F:    drivers/infiniband/hw/amso1100/
  
  ANALOG DEVICES INC ASOC CODEC DRIVERS
 -L:    device-driver-devel@blackfin.uclinux.org
 +L:    device-drivers-devel@blackfin.uclinux.org
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  W:    http://wiki.analog.com/
  S:    Supported
@@@ -927,8 -924,6 +927,8 @@@ F: drivers/mmc/host/msm_sdcc.
  F:    drivers/tty/serial/msm_serial.h
  F:    drivers/tty/serial/msm_serial.c
  F:    drivers/platform/msm/
 +F:    drivers/*/pm8???-*
 +F:    include/linux/mfd/pm8xxx/
  T:    git git://codeaurora.org/quic/kernel/davidb/linux-msm.git
  S:    Maintained
  
@@@ -1739,7 -1734,7 +1739,7 @@@ S:      Supporte
  F:    drivers/net/enic/
  
  CIRRUS LOGIC EP93XX ETHERNET DRIVER
 -M:    Lennert Buytenhek <kernel@wantstofly.org>
 +M:    Hartley Sweeten <hsweeten@visionengravers.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/arm/ep93xx_eth.c
@@@ -1889,6 -1884,7 +1889,6 @@@ L:      cpufreq@vger.kernel.or
  W:    http://www.codemonkey.org.uk/projects/cpufreq/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git
  S:    Maintained
 -F:    arch/x86/kernel/cpu/cpufreq/
  F:    drivers/cpufreq/
  F:    include/linux/cpufreq.h
  
@@@ -2038,8 -2034,9 +2038,8 @@@ F:      net/ax25/ax25_timer.
  F:    net/ax25/sysctl_net_ax25.c
  
  DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
 -M:    Tobias Ringstrom <tori@unhappy.mine.nu>
  L:    netdev@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/networking/dmfe.txt
  F:    drivers/net/tulip/dmfe.c
  
@@@ -2173,8 -2170,6 +2173,8 @@@ M:      Dan Williams <dan.j.williams@intel.c
  S:    Supported
  F:    drivers/dma/
  F:    include/linux/dma*
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git
 +T:    git git://git.infradead.org/users/vkoul/slave-dma.git (slave-dma)
  
  DME1737 HARDWARE MONITOR DRIVER
  M:    Juerg Haefliger <juergh@gmail.com>
@@@ -2250,10 -2245,10 +2250,10 @@@ F:   drivers/gpu/drm
  F:    include/drm/
  
  INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
 -M:    Chris Wilson <chris@chris-wilson.co.uk>
 +M:    Keith Packard <keithp@keithp.com>
  L:    intel-gfx@lists.freedesktop.org (subscribers-only)
  L:    dri-devel@lists.freedesktop.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git
  S:    Supported
  F:    drivers/gpu/drm/i915
  F:    include/drm/i915*
@@@ -2301,7 -2296,7 +2301,7 @@@ F:      net/bridge/netfilter/ebt*.
  ECRYPT FILE SYSTEM
  M:    Tyler Hicks <tyhicks@linux.vnet.ibm.com>
  M:    Dustin Kirkland <kirkland@canonical.com>
 -L:    ecryptfs-devel@lists.launchpad.net
 +L:    ecryptfs@vger.kernel.org
  W:    https://launchpad.net/ecryptfs
  S:    Supported
  F:    Documentation/filesystems/ecryptfs.txt
@@@ -2581,13 -2576,6 +2581,13 @@@ S:    Maintaine
  F:    drivers/hwmon/f75375s.c
  F:    include/linux/f75375s.h
  
 +FIREWIRE AUDIO DRIVERS
 +M:    Clemens Ladisch <clemens@ladisch.de>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +T:    git git://git.alsa-project.org/alsa-kernel.git
 +S:    Maintained
 +F:    sound/firewire/
 +
  FIREWIRE SUBSYSTEM
  M:    Stefan Richter <stefanr@s5r6.in-berlin.de>
  L:    linux1394-devel@lists.sourceforge.net
@@@ -3028,8 -3016,9 +3028,8 @@@ S:      Maintaine
  F:    drivers/net/wireless/hostap/
  
  HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
 -M:    Carlos Corbacho <carlos@strangeworlds.co.uk>
  L:    platform-driver-x86@vger.kernel.org
 -S:    Odd Fixes
 +S:    Orphan
  F:    drivers/platform/x86/tc1100-wmi.c
  
  HP100:        Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series
@@@ -3577,16 -3566,9 +3577,16 @@@ M:    Andrew Morton <akpm@linux-foundation
  M:    Jan Kara <jack@suse.cz>
  L:    linux-ext4@vger.kernel.org
  S:    Maintained
 -F:    fs/jbd*/
 -F:    include/linux/ext*jbd*.h
 -F:    include/linux/jbd*.h
 +F:    fs/jbd/
 +F:    include/linux/ext3_jbd.h
 +F:    include/linux/jbd.h
 +
 +JOURNALLING LAYER FOR BLOCK DEVICES (JBD2)
 +M:    "Theodore Ts'o" <tytso@mit.edu>
 +L:    linux-ext4@vger.kernel.org
 +S:    Maintained
 +F:    fs/jbd2/
 +F:    include/linux/jbd2.h
  
  JSM Neo PCI based serial card
  M:    Breno Leitao <leitao@linux.vnet.ibm.com>
@@@ -3609,9 -3591,10 +3609,9 @@@ F:     Documentation/hwmon/k8tem
  F:    drivers/hwmon/k8temp.c
  
  KCONFIG
 -M:    Roman Zippel <zippel@linux-m68k.org>
 +M:    Michal Marek <mmarek@suse.cz>
  L:    linux-kbuild@vger.kernel.org
 -Q:    http://patchwork.kernel.org/project/linux-kbuild/list/
 -S:    Maintained
 +S:    Odd Fixes
  F:    Documentation/kbuild/kconfig-language.txt
  F:    scripts/kconfig/
  
@@@ -3722,7 -3705,7 +3722,7 @@@ KEYS/KEYRINGS
  M:    David Howells <dhowells@redhat.com>
  L:    keyrings@linux-nfs.org
  S:    Maintained
 -F:    Documentation/keys.txt
 +F:    Documentation/security/keys.txt
  F:    include/linux/key.h
  F:    include/linux/key-type.h
  F:    include/keys/
@@@ -3734,7 -3717,7 +3734,7 @@@ M:      Mimi Zohar <zohar@us.ibm.com
  L:    linux-security-module@vger.kernel.org
  L:    keyrings@linux-nfs.org
  S:    Supported
 -F:    Documentation/keys-trusted-encrypted.txt
 +F:    Documentation/security/keys-trusted-encrypted.txt
  F:    include/keys/trusted-type.h
  F:    security/keys/trusted.c
  F:    security/keys/trusted.h
@@@ -3745,7 -3728,7 +3745,7 @@@ M:      David Safford <safford@watson.ibm.co
  L:    linux-security-module@vger.kernel.org
  L:    keyrings@linux-nfs.org
  S:    Supported
 -F:    Documentation/keys-trusted-encrypted.txt
 +F:    Documentation/security/keys-trusted-encrypted.txt
  F:    include/keys/encrypted-type.h
  F:    security/keys/encrypted.c
  F:    security/keys/encrypted.h
@@@ -3819,12 -3802,6 +3819,12 @@@ S:    Maintaine
  F:    drivers/leds/
  F:    include/linux/leds.h
  
 +LEGACY EEPROM DRIVER
 +M:    Jean Delvare <khali@linux-fr.org>
 +S:    Maintained
 +F:    Documentation/misc-devices/eeprom
 +F:    drivers/misc/eeprom/eeprom.c
 +
  LEGO USB Tower driver
  M:    Juergen Stuber <starblue@users.sourceforge.net>
  L:    legousb-devel@lists.sourceforge.net
@@@ -3921,6 -3898,7 +3921,6 @@@ F:      drivers/*/*/*pasemi
  LINUX SECURITY MODULE (LSM) FRAMEWORK
  M:    Chris Wright <chrisw@sous-sol.org>
  L:    linux-security-module@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git
  S:    Supported
  
  LIS3LV02D ACCELEROMETER DRIVER
@@@ -4150,13 -4128,12 +4150,13 @@@ F:   include/linux/mm.
  F:    mm/
  
  MEMORY RESOURCE CONTROLLER
 -M:    Balbir Singh <balbir@linux.vnet.ibm.com>
 +M:    Balbir Singh <bsingharora@gmail.com>
  M:    Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
  M:    KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
  L:    linux-mm@kvack.org
  S:    Maintained
  F:    mm/memcontrol.c
 +F:    mm/page_cgroup.c
  
  MEMORY TECHNOLOGY DEVICES (MTD)
  M:    David Woodhouse <dwmw2@infradead.org>
@@@ -4257,7 -4234,8 +4257,7 @@@ F:      drivers/mmc
  F:    include/linux/mmc/
  
  MULTIMEDIA CARD (MMC) ETC. OVER SPI
 -M:    David Brownell <dbrownell@users.sourceforge.net>
 -S:    Odd Fixes
 +S:    Orphan
  F:    drivers/mmc/host/mmc_spi.c
  F:    include/linux/spi/mmc_spi.h
  
@@@ -4607,6 -4585,7 +4607,6 @@@ F:      drivers/media/video/omap3isp/
  
  OMAP USB SUPPORT
  M:    Felipe Balbi <balbi@ti.com>
 -M:    David Brownell <dbrownell@users.sourceforge.net>
  L:    linux-usb@vger.kernel.org
  L:    linux-omap@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
@@@ -4895,7 -4874,7 +4895,7 @@@ F:      mm/percpu*.
  F:    arch/*/include/asm/percpu.h
  
  PER-TASK DELAY ACCOUNTING
 -M:    Balbir Singh <balbir@linux.vnet.ibm.com>
 +M:    Balbir Singh <bsingharora@gmail.com>
  S:    Maintained
  F:    include/linux/delayacct.h
  F:    kernel/delayacct.c
@@@ -4950,7 -4929,6 +4950,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    drivers/input/serio/i8042-unicore32io.h
  F:    drivers/i2c/busses/i2c-puv3.c
  F:    drivers/video/fb-puv3.c
 +F:    drivers/rtc/rtc-puv3.c
  
  PMC SIERRA MaxRAID DRIVER
  M:    Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
@@@ -5452,13 -5430,6 +5452,13 @@@ L:    linux-serial@vger.kernel.or
  S:    Maintained
  F:    drivers/tty/serial
  
 +SYNOPSYS DESIGNWARE DMAC DRIVER
 +M:    Viresh Kumar <viresh.kumar@st.com>
 +S:    Maintained
 +F:    include/linux/dw_dmac.h
 +F:    drivers/dma/dw_dmac_regs.h
 +F:    drivers/dma/dw_dmac.c
 +
  TIMEKEEPING, NTP
  M:    John Stultz <johnstul@us.ibm.com>
  M:    Thomas Gleixner <tglx@linutronix.de>
@@@ -5523,7 -5494,7 +5523,7 @@@ F:      drivers/scsi/sg.
  F:    include/scsi/sg.h
  
  SCSI SUBSYSTEM
 -M:    "James E.J. Bottomley" <James.Bottomley@suse.de>
 +M:    "James E.J. Bottomley" <JBottomley@parallels.com>
  L:    linux-scsi@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git
@@@ -5621,11 -5592,10 +5621,11 @@@ M:   James Morris <jmorris@namei.org
  M:    Eric Paris <eparis@parisplace.org>
  L:    selinux@tycho.nsa.gov (subscribers-only, general discussion)
  W:    http://selinuxproject.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
 +T:    git git://git.infradead.org/users/eparis/selinux.git
  S:    Supported
  F:    include/linux/selinux*
  F:    security/selinux/
 +F:    scripts/selinux/
  
  APPARMOR SECURITY MODULE
  M:    John Johansen <john.johansen@canonical.com>
@@@ -5988,6 -5958,7 +5988,6 @@@ F:      Documentation/serial/specialix.tx
  F:    drivers/staging/tty/specialix*
  
  SPI SUBSYSTEM
 -M:    David Brownell <dbrownell@users.sourceforge.net>
  M:    Grant Likely <grant.likely@secretlab.ca>
  L:    spi-devel-general@lists.sourceforge.net
  Q:    http://patchwork.kernel.org/project/spi-devel-general/list/
@@@ -6015,7 -5986,7 +6015,7 @@@ F:      Documentation/filesystems/spufs.tx
  F:    arch/powerpc/platforms/cell/spufs/
  
  SQUASHFS FILE SYSTEM
 -M:    Phillip Lougher <phillip@lougher.demon.co.uk>
 +M:    Phillip Lougher <phillip@squashfs.org.uk>
  L:    squashfs-devel@lists.sourceforge.net (subscribers-only)
  W:    http://squashfs.org.uk
  S:    Maintained
@@@ -6091,19 -6062,8 +6091,19 @@@ F:    Documentation/filesystems/sysv-fs.tx
  F:    fs/sysv/
  F:    include/linux/sysv_fs.h
  
 +TARGET SUBSYSTEM
 +M:    Nicholas A. Bellinger <nab@linux-iscsi.org>
 +L:    linux-scsi@vger.kernel.org
 +L:    http://groups.google.com/group/linux-iscsi-target-dev
 +W:    http://www.linux-iscsi.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nab/lio-core-2.6.git master
 +S:    Supported
 +F:    drivers/target/
 +F:    include/target/
 +F:    Documentation/target/
 +
  TASKSTATS STATISTICS INTERFACE
 -M:    Balbir Singh <balbir@linux.vnet.ibm.com>
 +M:    Balbir Singh <bsingharora@gmail.com>
  S:    Maintained
  F:    Documentation/accounting/taskstats*
  F:    include/linux/taskstats*
@@@ -6435,8 -6395,9 +6435,8 @@@ S:      Maintaine
  F:    drivers/usb/misc/rio500*
  
  USB EHCI DRIVER
 -M:    David Brownell <dbrownell@users.sourceforge.net>
  L:    linux-usb@vger.kernel.org
 -S:    Odd Fixes
 +S:    Orphan
  F:    Documentation/usb/ehci.txt
  F:    drivers/usb/host/ehci*
  
@@@ -6450,10 -6411,9 +6450,10 @@@ S:    Maintaine
  F:    drivers/media/video/et61x251/
  
  USB GADGET/PERIPHERAL SUBSYSTEM
 -M:    David Brownell <dbrownell@users.sourceforge.net>
 +M:    Felipe Balbi <balbi@ti.com>
  L:    linux-usb@vger.kernel.org
  W:    http://www.linux-usb.org/gadget
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
  F:    drivers/usb/gadget/
  F:    include/linux/usb/gadget*
@@@ -6463,7 -6423,7 +6463,7 @@@ M:      Jiri Kosina <jkosina@suse.cz
  L:    linux-usb@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
  S:    Maintained
- F:    Documentation/usb/hiddev.txt
+ F:    Documentation/hid/hiddev.txt
  F:    drivers/hid/usbhid/
  
  USB ISP116X DRIVER
@@@ -6495,8 -6455,9 +6495,8 @@@ S:      Maintaine
  F:    sound/usb/midi.*
  
  USB OHCI DRIVER
 -M:    David Brownell <dbrownell@users.sourceforge.net>
  L:    linux-usb@vger.kernel.org
 -S:    Odd Fixes
 +S:    Orphan
  F:    Documentation/usb/ohci.txt
  F:    drivers/usb/host/ohci*
  
@@@ -6722,14 -6683,6 +6722,14 @@@ S:    Maintaine
  F:    Documentation/filesystems/vfat.txt
  F:    fs/fat/
  
 +VIDEOBUF2 FRAMEWORK
 +M:    Pawel Osciak <pawel@osciak.com>
 +M:    Marek Szyprowski <m.szyprowski@samsung.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/video/videobuf2-*
 +F:    include/media/videobuf2-*
 +
  VIRTIO CONSOLE DRIVER
  M:    Amit Shah <amit.shah@redhat.com>
  L:    virtualization@lists.linux-foundation.org
@@@ -6842,13 -6795,6 +6842,13 @@@ L:    lm-sensors@lm-sensors.or
  S:    Maintained
  F:    drivers/hwmon/vt8231.c
  
 +VUB300 USB to SDIO/SD/MMC bridge chip
 +M:    Tony Olech <tony.olech@elandigitalsystems.com>
 +L:    linux-mmc@vger.kernel.org
 +L:    linux-usb@vger.kernel.org
 +S:    Supported
 +F:    drivers/mmc/host/vub300.c
 +
  W1 DALLAS'S 1-WIRE BUS
  M:    Evgeniy Polyakov <johnpol@2ka.mipt.ru>
  S:    Maintained