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-media: (31 commits)
  Revert "[media] af9015: limit I2C access to keep FW happy"
  [media] s5p-fimc: Fix camera input configuration in subdev operations
  [media] m5mols: Fix logic in sanity check
  [media] ati_remote: switch to single-byte scancodes
  [media] V4L: mt9m111: fix uninitialised mutex
  [media] V4L: omap1_camera: fix missing <linux/module.h> include
  [media] V4L: mt9t112: use after free in mt9t112_probe()
  [media] V4L: soc-camera: fix compiler warnings on 64-bit platforms
  [media] s5p_mfc_enc: fix s/H264/H263/ typo
  [media] omap_vout: Fix compile error in 3.1
  [media] au0828: add missing models 72101, 72201 & 72261 to the model matrix
  [media] au0828: add missing USB ID 2040:7213
  [media] au0828: add missing USB ID 2040:7260
  [media] [trivial] omap24xxcam-dma: Fix logical test
  [media] omap_vout: fix crash if no driver for a display
  [media] media: video: s5p-tv: fix build break
  [media] omap3isp: fix compilation of ispvideo.c
  [media] m5mols: Fix set_fmt to return proper pixel format code
  [media] s5p-fimc: Use correct fourcc for RGB565 colour format
  [media] s5p-fimc: Fail driver probing when sensor configuration is wrong
  ...

diff --combined MAINTAINERS
index 855afd4,273b049..6afba60
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -316,10 -316,6 +316,10 @@@ W:       http://wiki.analog.com/AD787
  S:    Supported
  F:    drivers/input/touchscreen/ad7879.c
  
 +ADDRESS SPACE LAYOUT RANDOMIZATION (ASLR)
 +M:    Jiri Kosina <jkosina@suse.cz>
 +S:    Maintained
 +
  ADM1025 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <khali@linux-fr.org>
  L:    lm-sensors@lm-sensors.org
@@@ -511,8 -507,8 +511,8 @@@ M: Joerg Roedel <joerg.roedel@amd.com
  L:    iommu@lists.linux-foundation.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git
  S:    Supported
 -F:    arch/x86/kernel/amd_iommu*.c
 -F:    arch/x86/include/asm/amd_iommu*.h
 +F:    drivers/iommu/amd_iommu*.[ch]
 +F:    include/linux/amd-iommu.h
  
  AMD MICROCODE UPDATE SUPPORT
  M:    Andreas Herrmann <andreas.herrmann3@amd.com>
@@@ -692,12 -688,6 +692,12 @@@ F:       drivers/mtd/nand/bcm_umi_nand.
  F:    drivers/mtd/nand/bcm_umi_bch.c
  F:    drivers/mtd/nand/nand_bcm_umi.h
  
 +ARM/CALXEDA HIGHBANK ARCHITECTURE
 +M:    Rob Herring <rob.herring@calxeda.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-highbank/
 +
  ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT
  M:    Anton Vorontsov <avorontsov@mvista.com>
  S:    Maintained
@@@ -789,7 -779,6 +789,7 @@@ L: linux-arm-kernel@lists.infradead.or
  S:    Maintained
  T:    git git://git.pengutronix.de/git/imx/linux-2.6.git
  F:    arch/arm/mach-mx*/
 +F:    arch/arm/mach-imx/
  F:    arch/arm/plat-mxc/
  
  ARM/FREESCALE IMX51
@@@ -798,20 -787,6 +798,20 @@@ L:       linux-arm-kernel@lists.infradead.or
  S:    Maintained
  F:    arch/arm/mach-mx5/
  
 +ARM/FREESCALE IMX6
 +M:    Shawn Guo <shawn.guo@linaro.org>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +T:    git git://git.linaro.org/people/shawnguo/linux-2.6.git
 +F:    arch/arm/mach-imx/*imx6*
 +
 +ARM/FREESCALE MXS ARM ARCHITECTURE
 +M:    Shawn Guo <shawn.guo@linaro.org>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +T:    git git://git.linaro.org/people/shawnguo/linux-2.6.git
 +F:    arch/arm/mach-mxs/
 +
  ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1040,7 -1015,6 +1040,7 @@@ F:      arch/arm/include/asm/hardware/ioc.
  F:    arch/arm/include/asm/hardware/iomd.h
  F:    arch/arm/include/asm/hardware/memc.h
  F:    arch/arm/mach-rpc/
 +F:    drivers/net/ethernet/8390/etherh.c
  F:    drivers/net/ethernet/i825xx/ether1*
  F:    drivers/net/ethernet/seeq/ether3*
  F:    drivers/scsi/arm/
@@@ -1054,18 -1028,35 +1054,18 @@@ ARM/SAMSUNG ARM ARCHITECTURE
  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)
 +L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
  W:    http://www.fluff.org/ben/linux/
  S:    Maintained
  F:    arch/arm/plat-samsung/
  F:    arch/arm/plat-s3c24xx/
  F:    arch/arm/plat-s5p/
 +F:    arch/arm/mach-s3c24*/
 +F:    arch/arm/mach-s3c64xx/
  F:    drivers/*/*s3c2410*
  F:    drivers/*/*/*s3c2410*
 -
 -ARM/S3C2410 ARM ARCHITECTURE
 -M:    Ben Dooks <ben-linux@fluff.org>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -W:    http://www.fluff.org/ben/linux/
 -S:    Maintained
 -F:    arch/arm/mach-s3c2410/
 -
 -ARM/S3C244x ARM ARCHITECTURE
 -M:    Ben Dooks <ben-linux@fluff.org>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -W:    http://www.fluff.org/ben/linux/
 -S:    Maintained
 -F:    arch/arm/mach-s3c2440/
 -F:    arch/arm/mach-s3c2443/
 -
 -ARM/S3C64xx ARM ARCHITECTURE
 -M:    Ben Dooks <ben-linux@fluff.org>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -W:    http://www.fluff.org/ben/linux/
 -S:    Maintained
 -F:    arch/arm/mach-s3c64xx/
 +F:    drivers/spi/spi-s3c*
 +F:    sound/soc/samsung/*
  
  ARM/S5P EXYNOS ARM ARCHITECTURES
  M:    Kukjin Kim <kgene.kim@samsung.com>
@@@ -1709,7 -1700,6 +1709,7 @@@ F:      include/linux/can.
  F:    include/linux/can/core.h
  F:    include/linux/can/bcm.h
  F:    include/linux/can/raw.h
 +F:    include/linux/can/gw.h
  
  CAN NETWORK DRIVERS
  M:    Wolfgang Grandegger <wg@grandegger.com>
@@@ -1780,14 -1770,6 +1780,14 @@@ F:    include/net/cfg80211.
  F:    net/wireless/*
  X:    net/wireless/wext*
  
 +CHAR and MISC DRIVERS
 +M:    Arnd Bergmann <arnd@arndb.de>
 +M:    Greg Kroah-Hartman <greg@kroah.com>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
 +S:    Maintained
 +F:    drivers/char/*
 +F:    drivers/misc/*
 +
  CHECKPATCH
  M:    Andy Whitcroft <apw@canonical.com>
  S:    Supported
@@@ -1926,11 -1908,9 +1926,11 @@@ S:    Maintaine
  F:    drivers/connector/
  
  CONTROL GROUPS (CGROUPS)
 -M:    Paul Menage <paul@paulmenage.org>
 +M:    Tejun Heo <tj@kernel.org>
  M:    Li Zefan <lizf@cn.fujitsu.com>
  L:    containers@lists.linux-foundation.org
 +L:    cgroups@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
  S:    Maintained
  F:    include/linux/cgroup*
  F:    kernel/cgroup*
@@@ -2344,13 -2324,6 +2344,13 @@@ S:    Supporte
  F:    drivers/gpu/drm/i915
  F:    include/drm/i915*
  
 +DRM DRIVERS FOR EXYNOS
 +M:    Inki Dae <inki.dae@samsung.com>
 +L:    dri-devel@lists.freedesktop.org
 +S:    Supported
 +F:    drivers/gpu/drm/exynos
 +F:    include/drm/exynos*
 +
  DSCC4 DRIVER
  M:    Francois Romieu <romieu@fr.zoreil.com>
  L:    netdev@vger.kernel.org
@@@ -2397,7 -2370,7 +2397,7 @@@ F:      include/linux/netfilter_bridge/ebt_*
  F:    net/bridge/netfilter/ebt*.c
  
  ECRYPT FILE SYSTEM
 -M:    Tyler Hicks <tyhicks@linux.vnet.ibm.com>
 +M:    Tyler Hicks <tyhicks@canonical.com>
  M:    Dustin Kirkland <kirkland@canonical.com>
  L:    ecryptfs@vger.kernel.org
  W:    https://launchpad.net/ecryptfs
@@@ -2478,6 -2451,8 +2478,6 @@@ L:      linux-edac@vger.kernel.or
  W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i7core_edac.c
 -F:    drivers/edac/edac_mce.c
 -F:    include/linux/edac_mce.h
  
  EDAC-I82975X
  M:    Ranganathan Desikan <ravi@jetztechnologies.com>
@@@ -2501,13 -2476,6 +2501,13 @@@ W:    bluesmoke.sourceforge.ne
  S:    Maintained
  F:    drivers/edac/r82600_edac.c
  
 +EDAC-SBRIDGE
 +M:    Mauro Carvalho Chehab <mchehab@redhat.com>
 +L:    linux-edac@vger.kernel.org
 +W:    bluesmoke.sourceforge.net
 +S:    Maintained
 +F:    drivers/edac/sb_edac.c
 +
  EDIROL UA-101/UA-1000 DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -2585,7 -2553,7 +2585,7 @@@ S:      Maintaine
  F:    drivers/net/ethernet/i825xx/eexpress.*
  
  ETHERNET BRIDGE
 -M:    Stephen Hemminger <shemminger@linux-foundation.org>
 +M:    Stephen Hemminger <shemminger@vyatta.com>
  L:    bridge@lists.linux-foundation.org
  L:    netdev@vger.kernel.org
  W:    http://www.linuxfoundation.org/en/Net:Bridge
@@@ -3029,13 -2997,6 +3029,13 @@@ F:    Documentation/hw_random.tx
  F:    drivers/char/hw_random/
  F:    include/linux/hw_random.h
  
 +HARDWARE SPINLOCK CORE
 +M:    Ohad Ben-Cohen <ohad@wizery.com>
 +S:    Maintained
 +F:    Documentation/hwspinlock.txt
 +F:    drivers/hwspinlock/hwspinlock_*
 +F:    include/linux/hwspinlock.h
 +
  HARMONY SOUND DRIVER
  M:    Kyle McMartin <kyle@mcmartin.ca>
  L:    linux-parisc@vger.kernel.org
@@@ -3101,7 -3062,6 +3101,7 @@@ F:      include/linux/hid
  
  HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS
  M:    Thomas Gleixner <tglx@linutronix.de>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
  S:    Maintained
  F:    Documentation/timers/
  F:    kernel/hrtimer.c
@@@ -3229,7 -3189,8 +3229,7 @@@ IA64 (Itanium) PLATFOR
  M:    Tony Luck <tony.luck@intel.com>
  M:    Fenghua Yu <fenghua.yu@intel.com>
  L:    linux-ia64@vger.kernel.org
 -W:    http://www.ia64-linux.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
  S:    Maintained
  F:    arch/ia64/
  
@@@ -3267,13 -3228,6 +3267,13 @@@ F:    Documentation/ide
  F:    drivers/ide/
  F:    include/linux/ide.h
  
 +IDEAPAD LAPTOP EXTRAS DRIVER
 +M:    Ike Panhc <ike.pan@canonical.com>
 +L:    platform-driver-x86@vger.kernel.org
 +W:    http://launchpad.net/ideapad-laptop
 +S:    Maintained
 +F:    drivers/platform/x86/ideapad-laptop.c
 +
  IDE/ATAPI DRIVERS
  M:    Borislav Petkov <petkovbb@gmail.com>
  L:    linux-ide@vger.kernel.org
@@@ -3611,7 -3565,7 +3611,7 @@@ F:      net/irda
  IRQ SUBSYSTEM
  M:    Thomas Gleixner <tglx@linutronix.de>
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git irq/core
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
  F:    kernel/irq/
  
  ISAPNP
@@@ -3720,7 -3674,7 +3720,7 @@@ F:      fs/jbd2
  F:    include/linux/jbd2.h
  
  JSM Neo PCI based serial card
 -M:    Breno Leitao <leitao@linux.vnet.ibm.com>
 +M:    Lucas Tavares <lucaskt@linux.vnet.ibm.com>
  L:    linux-serial@vger.kernel.org
  S:    Maintained
  F:    drivers/tty/serial/jsm/
@@@ -4060,7 -4014,6 +4060,7 @@@ M:      Eric Piel <eric.piel@tremplin-utc.ne
  S:    Maintained
  F:    Documentation/misc-devices/lis3lv02d
  F:    drivers/misc/lis3lv02d/
 +F:    drivers/platform/x86/hp_accel.c
  
  LLC (802.2)
  M:    Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
@@@ -4099,7 -4052,7 +4099,7 @@@ F:      drivers/hwmon/lm90.
  LOCKDEP AND LOCKSTAT
  M:    Peter Zijlstra <peterz@infradead.org>
  M:    Ingo Molnar <mingo@redhat.com>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/locking
  S:    Maintained
  F:    Documentation/lockdep*.txt
  F:    Documentation/lockstat.txt
@@@ -4281,7 -4234,9 +4281,9 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    Documentation/dvb/
  F:    Documentation/video4linux/
+ F:    Documentation/DocBook/media/
  F:    drivers/media/
+ F:    drivers/staging/media/
  F:    include/media/
  F:    include/linux/dvb/
  F:    include/linux/videodev*.h
@@@ -4303,11 -4258,9 +4305,11 @@@ F:    include/linux/mm.
  F:    mm/
  
  MEMORY RESOURCE CONTROLLER
 +M:    Johannes Weiner <hannes@cmpxchg.org>
 +M:    Michal Hocko <mhocko@suse.cz>
  M:    Balbir Singh <bsingharora@gmail.com>
 -M:    Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
  M:    KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
 +L:    cgroups@vger.kernel.org
  L:    linux-mm@kvack.org
  S:    Maintained
  F:    mm/memcontrol.c
@@@ -4341,7 -4294,7 +4343,7 @@@ MIP
  M:    Ralf Baechle <ralf@linux-mips.org>
  L:    linux-mips@linux-mips.org
  W:    http://www.linux-mips.org/
 -T:    git git://git.linux-mips.org/pub/scm/linux.git
 +T:    git git://git.linux-mips.org/pub/scm/ralf/linux.git
  Q:    http://patchwork.linux-mips.org/project/linux-mips/list/
  S:    Supported
  F:    Documentation/mips/
@@@ -4474,7 -4427,7 +4476,7 @@@ S:      Supporte
  F:    drivers/infiniband/hw/nes/
  
  NETEM NETWORK EMULATOR
 -M:    Stephen Hemminger <shemminger@linux-foundation.org>
 +M:    Stephen Hemminger <shemminger@vyatta.com>
  L:    netem@lists.linux-foundation.org
  S:    Maintained
  F:    net/sched/sch_netem.c
@@@ -4490,9 -4443,11 +4492,9 @@@ F:     Documentation/networking/vxge.tx
  F:    drivers/net/ethernet/neterion/
  
  NETFILTER/IPTABLES/IPCHAINS
 -P:    Rusty Russell
 -P:    Marc Boucher
 -P:    James Morris
  P:    Harald Welte
  P:    Jozsef Kadlecsik
 +M:    Pablo Neira Ayuso <pablo@netfilter.org>
  M:    Patrick McHardy <kaber@trash.net>
  L:    netfilter-devel@vger.kernel.org
  L:    netfilter@vger.kernel.org
@@@ -4685,7 -4640,7 +4687,7 @@@ L:      linux-omap@vger.kernel.or
  W:    http://www.muru.com/linux/omap/
  W:    http://linux.omap.com/
  Q:    http://patchwork.kernel.org/project/linux-omap/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
  S:    Maintained
  F:    arch/arm/*omap*/
  
@@@ -4733,13 -4688,6 +4735,13 @@@ S:    Maintaine
  F:    drivers/video/omap2/
  F:    Documentation/arm/OMAP/DSS
  
 +OMAP HARDWARE SPINLOCK SUPPORT
 +M:    Ohad Ben-Cohen <ohad@wizery.com>
 +L:    linux-omap@vger.kernel.org
 +S:    Maintained
 +F:    drivers/hwspinlock/omap_hwspinlock.c
 +F:    arch/arm/mach-omap2/hwspinlock.c
 +
  OMAP MMC SUPPORT
  M:    Jarkko Lavinen <jarkko.lavinen@nokia.com>
  L:    linux-omap@vger.kernel.org
@@@ -4951,7 -4899,7 +4953,7 @@@ F:      drivers/char/ppdev.
  F:    include/linux/ppdev.h
  
  PARAVIRT_OPS INTERFACE
 -M:    Jeremy Fitzhardinge <jeremy@xensource.com>
 +M:    Jeremy Fitzhardinge <jeremy@goop.org>
  M:    Chris Wright <chrisw@sous-sol.org>
  M:    Alok Kataria <akataria@vmware.com>
  M:    Rusty Russell <rusty@rustcorp.com.au>
@@@ -5022,7 -4970,7 +5024,7 @@@ F:      include/linux/i2c-algo-pca.
  F:    include/linux/i2c-pca-platform.h
  
  PCI ERROR RECOVERY
 -M:    Linas Vepstas <linas@austin.ibm.com>
 +M:     Linas Vepstas <linasvepstas@gmail.com>
  L:    linux-pci@vger.kernel.org
  S:    Supported
  F:    Documentation/PCI/pci-error-recovery.txt
@@@ -5087,7 -5035,6 +5089,7 @@@ M:      Peter Zijlstra <a.p.zijlstra@chello.
  M:    Paul Mackerras <paulus@samba.org>
  M:    Ingo Molnar <mingo@elte.hu>
  M:    Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
  S:    Supported
  F:    kernel/events/*
  F:    include/linux/perf_event.h
@@@ -5167,7 -5114,6 +5169,7 @@@ F:      drivers/scsi/pm8001
  
  POSIX CLOCKS and TIMERS
  M:    Thomas Gleixner <tglx@linutronix.de>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
  S:    Supported
  F:    fs/timerfd.c
  F:    include/linux/timer*
@@@ -5404,12 -5350,6 +5406,12 @@@ F:    fs/qnx4
  F:    include/linux/qnx4_fs.h
  F:    include/linux/qnxtypes.h
  
 +QUALCOMM HEXAGON ARCHITECTURE
 +M:    Richard Kuo <rkuo@codeaurora.org>
 +L:    linux-hexagon@vger.kernel.org
 +S:    Supported
 +F:    arch/hexagon/
 +
  RADOS BLOCK DEVICE (RBD)
  F:    include/linux/qnxtypes.h
  M:    Yehuda Sadeh <yehuda@hq.newdream.net>
@@@ -5485,7 -5425,7 +5487,7 @@@ S:      Maintaine
  F:    drivers/net/ethernet/rdc/r6040.c
  
  RDS - RELIABLE DATAGRAM SOCKETS
 -M:    Andy Grover <andy.grover@oracle.com>
 +M:    Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
  L:    rds-devel@oss.oracle.com (moderated for non-subscribers)
  S:    Supported
  F:    net/rds/
@@@ -5662,6 -5602,7 +5664,6 @@@ F:      drivers/media/video/*7146
  F:    include/media/*7146*
  
  SAMSUNG AUDIO (ASoC) DRIVERS
 -M:    Jassi Brar <jassisinghbrar@gmail.com>
  M:    Sangbeom Kim <sbkim73@samsung.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Supported
@@@ -5683,7 -5624,6 +5685,7 @@@ F:      drivers/dma/dw_dmac.
  TIMEKEEPING, NTP
  M:    John Stultz <johnstul@us.ibm.com>
  M:    Thomas Gleixner <tglx@linutronix.de>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
  S:    Supported
  F:    include/linux/clocksource.h
  F:    include/linux/time.h
@@@ -5708,7 -5648,6 +5710,7 @@@ F:      drivers/watchdog/sc1200wdt.
  SCHEDULER
  M:    Ingo Molnar <mingo@elte.hu>
  M:    Peter Zijlstra <peterz@infradead.org>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
  S:    Maintained
  F:    kernel/sched*
  F:    include/linux/sched.h
@@@ -5992,7 -5931,7 +5994,7 @@@ S:      Maintaine
  F:    drivers/usb/misc/sisusbvga/
  
  SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS
 -M:    Stephen Hemminger <shemminger@linux-foundation.org>
 +M:    Stephen Hemminger <shemminger@vyatta.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/ethernet/marvell/sk*
@@@ -6137,7 -6076,7 +6139,7 @@@ F:      sound
  SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
  M:    Liam Girdwood <lrg@ti.com>
  M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  W:    http://alsa-project.org/main/index.php/ASoC
  S:    Supported
@@@ -6636,7 -6575,7 +6638,7 @@@ TRACIN
  M:    Steven Rostedt <rostedt@goodmis.org>
  M:    Frederic Weisbecker <fweisbec@gmail.com>
  M:    Ingo Molnar <mingo@redhat.com>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf/core
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
  S:    Maintained
  F:    Documentation/trace/ftrace.txt
  F:    arch/*/*/*/ftrace.h
@@@ -6716,6 -6655,7 +6718,6 @@@ F:      drivers/net/ethernet/8390/ne-h8300.
  
  UDF FILESYSTEM
  M:    Jan Kara <jack@suse.cz>
 -W:    http://linux-udf.sourceforge.net
  S:    Maintained
  F:    Documentation/filesystems/udf.txt
  F:    fs/udf/
@@@ -7386,7 -7326,7 +7388,7 @@@ M:      Thomas Gleixner <tglx@linutronix.de
  M:    Ingo Molnar <mingo@redhat.com>
  M:    "H. Peter Anvin" <hpa@zytor.com>
  M:    x86@kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
  S:    Maintained
  F:    Documentation/x86/
  F:    arch/x86/
@@@ -7406,8 -7346,8 +7408,8 @@@ S:      Maintaine
  F:    arch/x86/kernel/cpu/mcheck/*
  
  XEN HYPERVISOR INTERFACE
 -M:    Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 +M:    Jeremy Fitzhardinge <jeremy@goop.org>
  L:    xen-devel@lists.xensource.com (moderated for non-subscribers)
  L:    virtualization@lists.linux-foundation.org
  S:    Supported
@@@ -7440,8 -7380,7 +7442,8 @@@ F:      drivers/xen/*swiotlb
  
  XFS FILESYSTEM
  P:    Silicon Graphics Inc
 -M:    Alex Elder <aelder@sgi.com>
 +M:    Ben Myers <bpm@sgi.com>
 +M:    Alex Elder <elder@kernel.org>
  M:    xfs-masters@oss.sgi.com
  L:    xfs@oss.sgi.com
  W:    http://oss.sgi.com/projects/xfs

diff --combined drivers/media/video/m5mols/m5mols_core.c
index 05ab370,5da8d74..e0f09e5
--- 1/drivers/media/video/m5mols/m5mols_core.c
--- 2/drivers/media/video/m5mols/m5mols_core.c
+++ b/drivers/media/video/m5mols/m5mols_core.c
@@@ -21,7 -21,6 +21,7 @@@
  #include <linux/gpio.h>
  #include <linux/regulator/consumer.h>
  #include <linux/videodev2.h>
 +#include <linux/module.h>
  #include <media/v4l2-ctrls.h>
  #include <media/v4l2-device.h>
  #include <media/v4l2-subdev.h>
@@@ -334,7 -333,7 +334,7 @@@ int m5mols_mode(struct m5mols_info *inf
        int ret = -EINVAL;
        u8 reg;
  
-       if (mode < REG_PARAMETER && mode > REG_CAPTURE)
+       if (mode < REG_PARAMETER || mode > REG_CAPTURE)
                return ret;
  
        ret = m5mols_read_u8(sd, SYSTEM_SYSMODE, &reg);
@@@ -511,9 -510,6 +511,6 @@@ static int m5mols_get_fmt(struct v4l2_s
        struct m5mols_info *info = to_m5mols(sd);
        struct v4l2_mbus_framefmt *format;
  
-       if (fmt->pad != 0)
-               return -EINVAL;
- 
        format = __find_format(info, fh, fmt->which, info->res_type);
        if (!format)
                return -EINVAL;
@@@ -532,9 -528,6 +529,6 @@@ static int m5mols_set_fmt(struct v4l2_s
        u32 resolution = 0;
        int ret;
  
-       if (fmt->pad != 0)
-               return -EINVAL;
- 
        ret = __find_resolution(sd, format, &type, &resolution);
        if (ret < 0)
                return ret;
@@@ -543,13 -536,14 +537,14 @@@
        if (!sfmt)
                return 0;
  
-       *sfmt           = m5mols_default_ffmt[type];
-       sfmt->width     = format->width;
-       sfmt->height    = format->height;
+ 
+       format->code = m5mols_default_ffmt[type].code;
+       format->colorspace = V4L2_COLORSPACE_JPEG;
+       format->field = V4L2_FIELD_NONE;
  
        if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
+               *sfmt = *format;
                info->resolution = resolution;
-               info->code = format->code;
                info->res_type = type;
        }
  
@@@ -626,13 -620,14 +621,14 @@@ static int m5mols_start_monitor(struct 
  static int m5mols_s_stream(struct v4l2_subdev *sd, int enable)
  {
        struct m5mols_info *info = to_m5mols(sd);
+       u32 code = info->ffmt[info->res_type].code;
  
        if (enable) {
                int ret = -EINVAL;
  
-               if (is_code(info->code, M5MOLS_RESTYPE_MONITOR))
+               if (is_code(code, M5MOLS_RESTYPE_MONITOR))
                        ret = m5mols_start_monitor(info);
-               if (is_code(info->code, M5MOLS_RESTYPE_CAPTURE))
+               if (is_code(code, M5MOLS_RESTYPE_CAPTURE))
                        ret = m5mols_start_capture(info);
  
                return ret;

diff --combined drivers/media/video/mt9m111.c
index cf2c0fb,dda4685..398f96f
--- 1/drivers/media/video/mt9m111.c
--- 2/drivers/media/video/mt9m111.c
+++ b/drivers/media/video/mt9m111.c
@@@ -14,7 -14,6 +14,7 @@@
  #include <linux/gpio.h>
  #include <linux/delay.h>
  #include <linux/v4l2-mediabus.h>
 +#include <linux/module.h>
  
  #include <media/soc_camera.h>
  #include <media/v4l2-common.h>
@@@ -955,6 -954,7 +955,7 @@@ static int mt9m111_probe(struct i2c_cli
        mt9m111->rect.height    = MT9M111_MAX_HEIGHT;
        mt9m111->fmt            = &mt9m111_colour_fmts[0];
        mt9m111->lastpage       = -1;
+       mutex_init(&mt9m111->power_lock);
  
        ret = mt9m111_video_probe(client);
        if (ret) {

diff --combined drivers/media/video/ov6650.c
index 9f2d26b,577941f..6806345
--- 1/drivers/media/video/ov6650.c
--- 2/drivers/media/video/ov6650.c
+++ b/drivers/media/video/ov6650.c
@@@ -29,7 -29,6 +29,7 @@@
  #include <linux/i2c.h>
  #include <linux/slab.h>
  #include <linux/v4l2-mediabus.h>
 +#include <linux/module.h>
  
  #include <media/soc_camera.h>
  #include <media/v4l2-chip-ident.h>
@@@ -540,7 -539,7 +540,7 @@@ static u8 to_clkrc(struct v4l2_fract *t
  static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
  {
        struct i2c_client *client = v4l2_get_subdevdata(sd);
-       struct soc_camera_device *icd = (struct soc_camera_device *)sd->grp_id;
+       struct soc_camera_device *icd = v4l2_get_subdev_hostdata(sd);
        struct soc_camera_sense *sense = icd->sense;
        struct ov6650 *priv = to_ov6650(client);
        bool half_scale = !is_unscaled_ok(mf->width, mf->height, &priv->rect);

diff --combined drivers/media/video/sh_mobile_csi2.c
index ea4f047,bd0ca0e..8a652b5
--- 1/drivers/media/video/sh_mobile_csi2.c
--- 2/drivers/media/video/sh_mobile_csi2.c
+++ b/drivers/media/video/sh_mobile_csi2.c
@@@ -15,7 -15,6 +15,7 @@@
  #include <linux/pm_runtime.h>
  #include <linux/slab.h>
  #include <linux/videodev2.h>
 +#include <linux/module.h>
  
  #include <media/sh_mobile_ceu.h>
  #include <media/sh_mobile_csi2.h>
@@@ -143,7 -142,7 +143,7 @@@ static int sh_csi2_s_mbus_config(struc
                                 const struct v4l2_mbus_config *cfg)
  {
        struct sh_csi2 *priv = container_of(sd, struct sh_csi2, subdev);
-       struct soc_camera_device *icd = (struct soc_camera_device *)sd->grp_id;
+       struct soc_camera_device *icd = v4l2_get_subdev_hostdata(sd);
        struct v4l2_subdev *client_sd = soc_camera_to_subdev(icd);
        struct v4l2_mbus_config client_cfg = {.type = V4L2_MBUS_CSI2,
                                              .flags = priv->mipi_flags};
@@@ -202,7 -201,7 +202,7 @@@ static void sh_csi2_hwinit(struct sh_cs
  static int sh_csi2_client_connect(struct sh_csi2 *priv)
  {
        struct sh_csi2_pdata *pdata = priv->pdev->dev.platform_data;
-       struct soc_camera_device *icd = (struct soc_camera_device *)priv->subdev.grp_id;
+       struct soc_camera_device *icd = v4l2_get_subdev_hostdata(&priv->subdev);
        struct v4l2_subdev *client_sd = soc_camera_to_subdev(icd);
        struct device *dev = v4l2_get_subdevdata(&priv->subdev);
        struct v4l2_mbus_config cfg;