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

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (46 commits)
  [media] rc: call input_sync after scancode reports
  [media] imon: allow either proto on unknown 0xffdc
  [media] imon: auto-config ffdc 7e device
  [media] saa7134: fix raw IR timeout value
  [media] rc: fix ghost keypresses with certain hw
  [media] [staging] lirc_serial: allocate irq at init time
  [media] lirc_zilog: fix spinning rx thread
  [media] keymaps: fix table for pinnacle pctv hd devices
  [media] ite-cir: 8709 needs to use pnp resource 2
  [media] V4L: mx1-camera: fix uninitialized variable
  [media] omap_vout: Added check in reqbuf & mmap for buf_size allocation
  [media] OMAP_VOUT: Change hardcoded device node number to -1
  [media] OMAP_VOUTLIB: Fix wrong resizer calculation
  [media] uvcvideo: Disable the queue when failing to start
  [media] uvcvideo: Remove buffers from the queues when freeing
  [media] uvcvideo: Ignore entities for terminals with no supported format
  [media] v4l: Don't access media entity after is has been destroyed
  [media] media: omap3isp: fix a potential NULL deref
  [media] media: vb2: fix allocation failure check
  [media] media: vb2: reset queued_count value during queue reinitialization
  ...

Fix up trivial conflict in MAINTAINERS as per Mauro

diff --combined MAINTAINERS
index ae563fa,63be58b..584bdb2
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1345,18 -1345,16 +1345,18 @@@ F:   drivers/auxdisplay
  F:    include/linux/cfag12864b.h
  
  AVR32 ARCHITECTURE
 -M:    Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
 +M:    Haavard Skinnemoen <hskinnemoen@gmail.com>
 +M:    Hans-Christian Egtvedt <egtvedt@samfundet.no>
  W:    http://www.atmel.com/products/AVR32/
  W:    http://avr32linux.org/
  W:    http://avrfreaks.net/
 -S:    Supported
 +S:    Maintained
  F:    arch/avr32/
  
  AVR32/AT32AP MACHINE SUPPORT
 -M:    Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
 -S:    Supported
 +M:    Haavard Skinnemoen <hskinnemoen@gmail.com>
 +M:    Hans-Christian Egtvedt <egtvedt@samfundet.no>
 +S:    Maintained
  F:    arch/avr32/mach-at32ap/
  
  AX.25 NETWORK LAYER
@@@ -1392,6 -1390,7 +1392,6 @@@ F:      include/linux/backlight.
  BATMAN ADVANCED
  M:    Marek Lindner <lindner_marek@yahoo.de>
  M:    Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
 -M:    Sven Eckelmann <sven@narfation.org>
  L:    b.a.t.m.a.n@lists.open-mesh.org
  W:    http://www.open-mesh.org/
  S:    Maintained
@@@ -1424,6 -1423,7 +1424,6 @@@ S:      Supporte
  F:    arch/blackfin/
  
  BLACKFIN EMAC DRIVER
 -M:    Michael Hennerich <michael.hennerich@analog.com>
  L:    uclinux-dist-devel@blackfin.uclinux.org
  W:    http://blackfin.uclinux.org
  S:    Supported
@@@ -1639,7 -1639,7 +1639,7 @@@ CAN NETWORK LAYE
  M:    Oliver Hartkopp <socketcan@hartkopp.net>
  M:    Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
  M:    Urs Thuermann <urs.thuermann@volkswagen.de>
 -L:    socketcan-core@lists.berlios.de
 +L:    socketcan-core@lists.berlios.de (subscribers-only)
  L:    netdev@vger.kernel.org
  W:    http://developer.berlios.de/projects/socketcan/
  S:    Maintained
@@@ -1651,7 -1651,7 +1651,7 @@@ F:      include/linux/can/raw.
  
  CAN NETWORK DRIVERS
  M:    Wolfgang Grandegger <wg@grandegger.com>
 -L:    socketcan-core@lists.berlios.de
 +L:    socketcan-core@lists.berlios.de (subscribers-only)
  L:    netdev@vger.kernel.org
  W:    http://developer.berlios.de/projects/socketcan/
  S:    Maintained
@@@ -1739,7 -1739,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 -1889,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
  
@@@ -2291,7 -2292,8 +2291,7 @@@ F:      drivers/scsi/eata_pio.
  
  EBTABLES
  M:    Bart De Schuymer <bart.de.schuymer@pandora.be>
 -L:    ebtables-user@lists.sourceforge.net
 -L:    ebtables-devel@lists.sourceforge.net
 +L:    netfilter-devel@vger.kernel.org
  W:    http://ebtables.sourceforge.net/
  S:    Maintained
  F:    include/linux/netfilter_bridge/ebt_*.h
@@@ -3818,12 -3820,6 +3818,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
@@@ -4149,7 -4145,7 +4149,7 @@@ 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
@@@ -4256,7 -4252,8 +4256,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
  
@@@ -4606,6 -4603,7 +4606,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
@@@ -4894,7 -4892,7 +4894,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
@@@ -4949,7 -4947,6 +4949,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>
@@@ -5181,7 -5178,6 +5181,7 @@@ S:      Supporte
  F:    drivers/net/qlcnic/
  
  QLOGIC QLGE 10Gb ETHERNET DRIVER
 +M:    Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
  M:    Ron Mercer <ron.mercer@qlogic.com>
  M:    linux-driver@qlogic.com
  L:    netdev@vger.kernel.org
@@@ -5988,6 -5984,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/
@@@ -6103,7 -6100,7 +6103,7 @@@ 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,9 -6432,9 +6435,9 @@@ S:      Maintaine
  F:    drivers/usb/misc/rio500*
  
  USB EHCI DRIVER
 -M:    David Brownell <dbrownell@users.sourceforge.net>
 +M:    Alan Stern <stern@rowland.harvard.edu>
  L:    linux-usb@vger.kernel.org
 -S:    Odd Fixes
 +S:    Maintained
  F:    Documentation/usb/ehci.txt
  F:    drivers/usb/host/ehci*
  
@@@ -6451,10 -6448,9 +6451,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*
@@@ -6464,15 -6460,9 +6464,15 @@@ 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/IP DRIVERS
 +M:    Matt Mooney <mfm@muteddisk.com>
 +L:    linux-usb@vger.kernel.org
 +S:    Maintained
 +F:    drivers/staging/usbip/
 +
  USB ISP116X DRIVER
  M:    Olav Kongas <ok@artecdesign.ee>
  L:    linux-usb@vger.kernel.org
@@@ -6502,9 -6492,9 +6502,9 @@@ S:      Maintaine
  F:    sound/usb/midi.*
  
  USB OHCI DRIVER
 -M:    David Brownell <dbrownell@users.sourceforge.net>
 +M:    Alan Stern <stern@rowland.harvard.edu>
  L:    linux-usb@vger.kernel.org
 -S:    Odd Fixes
 +S:    Maintained
  F:    Documentation/usb/ohci.txt
  F:    drivers/usb/host/ohci*
  
@@@ -6733,6 -6723,7 +6733,7 @@@ F:      fs/fat
  VIDEOBUF2 FRAMEWORK
  M:    Pawel Osciak <pawel@osciak.com>
  M:    Marek Szyprowski <m.szyprowski@samsung.com>
+ M:    Kyungmin Park <kyungmin.park@samsung.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    drivers/media/video/videobuf2-*
@@@ -7015,13 -7006,6 +7016,13 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/platform/x86
  
 +X86 MCE INFRASTRUCTURE
 +M:    Tony Luck <tony.luck@intel.com>
 +M:    Borislav Petkov <bp@amd64.org>
 +L:    linux-edac@vger.kernel.org
 +S:    Maintained
 +F:    arch/x86/kernel/cpu/mcheck/*
 +
  XEN HYPERVISOR INTERFACE
  M:    Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>