Merge branch 'drm/for-next' of git://anongit.freedesktop.org/tegra/linux into drm...

These changes are mostly minor fixes to things introduced in 3.10. The
biggest chunk is updates to the host1x firewall which checks job
submissions from userspace and wasn't working properly. All other
patches are mostly one-liners. Nothing new or too exciting this time
around.

* 'drm/for-next' of git://anongit.freedesktop.org/tegra/linux:
  gpu: host1x: Rework CPU syncpoint increment
  gpu: host1x: Fix client_managed type
  gpu: host1x: Fix memory access in syncpt request
  gpu: host1x: Copy gathers before verification
  gpu: host1x: Don't reset firewall between gathers
  gpu: host1x: Check reloc table before usage
  gpu: host1x: Check INCR opcode correctly
  drm/tegra: Remove DRIVER_BUS_PLATFORM from driver_features
  drm/tegra: Fix return value
  drm/tegra: Include header drm/drm.h
  MAINTAINERS: Update Tegra DRM entry
  drm/tegra: fix error return code in gr2d_submit()
  drm/tegra: fix missing unlock on error
  drm/tegra: Honor pixel-format changes
  drm/tegra: Explicitly set irq_enabled
  drm/tegra: Don't disable unused planes

diff --combined MAINTAINERS
index 5be702cc8449d3edb8107256bb03bac25d937238,4f7d0bac1432bddda7056c4fa0efae03b74a3f7f..437dd12ab9cf990c2d75de576aae3eaf3c95d9ee
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2697,12 -2697,14 +2697,14 @@@ F:   include/drm/exynos
  F:    include/uapi/drm/exynos*
  
  DRM DRIVERS FOR NVIDIA TEGRA
- M:    Thierry Reding <thierry.reding@avionic-design.de>
+ M:    Thierry Reding <thierry.reding@gmail.com>
+ M:    Terje Bergström <tbergstrom@nvidia.com>
  L:    dri-devel@lists.freedesktop.org
  L:    linux-tegra@vger.kernel.org
- T:    git git://gitorious.org/thierryreding/linux.git
+ T:    git git://anongit.freedesktop.org/tegra/linux.git
  S:    Maintained
- F:    drivers/gpu/drm/tegra/
+ F:    drivers/gpu/host1x/
+ F:    include/uapi/drm/tegra_drm.h
  F:    Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
  
  DSBR100 USB FM RADIO DRIVER
@@@ -2890,8 -2892,8 +2892,8 @@@ F:      drivers/media/dvb-frontends/ec100
  
  ECRYPT FILE SYSTEM
  M:    Tyler Hicks <tyhicks@canonical.com>
 -M:    Dustin Kirkland <dustin.kirkland@gazzang.com>
  L:    ecryptfs@vger.kernel.org
 +W:    http://ecryptfs.org
  W:    https://launchpad.net/ecryptfs
  S:    Supported
  F:    Documentation/filesystems/ecryptfs.txt
@@@ -3322,12 -3324,11 +3324,12 @@@ F:   drivers/net/wan/dlci.
  F:    drivers/net/wan/sdla.c
  
  FRAMEBUFFER LAYER
 -M:    Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
 +M:    Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
 +M:    Tomi Valkeinen <tomi.valkeinen@ti.com>
  L:    linux-fbdev@vger.kernel.org
  W:    http://linux-fbdev.sourceforge.net/
  Q:    http://patchwork.kernel.org/project/linux-fbdev/list/
 -T:    git git://github.com/schandinat/linux-2.6.git fbdev-next
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev.git
  S:    Maintained
  F:    Documentation/fb/
  F:    Documentation/devicetree/bindings/fb/
@@@ -3866,16 -3867,9 +3868,16 @@@ M:    K. Y. Srinivasan <kys@microsoft.com
  M:    Haiyang Zhang <haiyangz@microsoft.com>
  L:    devel@linuxdriverproject.org
  S:    Maintained
 -F:    drivers/hv/
 +F:    arch/x86/include/asm/mshyperv.h
 +F:    arch/x86/include/uapi/asm/hyperv.h
 +F:    arch/x86/kernel/cpu/mshyperv.c
  F:    drivers/hid/hid-hyperv.c
 +F:    drivers/hv/
  F:    drivers/net/hyperv/
 +F:    drivers/scsi/storvsc_drv.c
 +F:    drivers/video/hyperv_fb.c
 +F:    include/linux/hyperv.h
 +F:    tools/hv/
  
  I2C OVER PARALLEL PORT
  M:    Jean Delvare <khali@linux-fr.org>
@@@ -4448,16 -4442,6 +4450,16 @@@ S:    Maintaine
  F:    drivers/scsi/*iscsi*
  F:    include/scsi/*iscsi*
  
 +ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR
 +M:    Or Gerlitz <ogerlitz@mellanox.com>
 +M:    Roi Dayan <roid@mellanox.com>
 +L:    linux-rdma@vger.kernel.org
 +S:    Supported
 +W:    http://www.openfabrics.org
 +W:    www.open-iscsi.org
 +Q:    http://patchwork.kernel.org/project/linux-rdma/list/
 +F:    drivers/infiniband/ulp/iser
 +
  ISDN SUBSYSTEM
  M:    Karsten Keil <isdn@linux-pingi.de>
  L:    isdn4linux@listserv.isdn4linux.de (subscribers-only)
@@@ -4659,13 -4643,12 +4661,13 @@@ F:   include/linux/sunrpc
  F:    include/uapi/linux/sunrpc/
  
  KERNEL VIRTUAL MACHINE (KVM)
 -M:    Marcelo Tosatti <mtosatti@redhat.com>
  M:    Gleb Natapov <gleb@redhat.com>
 +M:    Paolo Bonzini <pbonzini@redhat.com>
  L:    kvm@vger.kernel.org
 -W:    http://kvm.qumranet.com
 +W:    http://linux-kvm.org
  S:    Supported
 -F:    Documentation/*/kvm.txt
 +F:    Documentation/*/kvm*.txt
 +F:    Documentation/virtual/kvm/
  F:    arch/*/kvm/
  F:    arch/*/include/asm/kvm*
  F:    include/linux/kvm*
@@@ -5535,18 -5518,18 +5537,18 @@@ F:   Documentation/networking/s2io.tx
  F:    Documentation/networking/vxge.txt
  F:    drivers/net/ethernet/neterion/
  
 -NETFILTER/IPTABLES/IPCHAINS
 -P:    Harald Welte
 -P:    Jozsef Kadlecsik
 +NETFILTER/IPTABLES
  M:    Pablo Neira Ayuso <pablo@netfilter.org>
  M:    Patrick McHardy <kaber@trash.net>
 +M:    Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
  L:    netfilter-devel@vger.kernel.org
  L:    netfilter@vger.kernel.org
  L:    coreteam@netfilter.org
  W:    http://www.netfilter.org/
  W:    http://www.iptables.org/
 -T:    git git://1984.lsi.us.es/nf
 -T:    git git://1984.lsi.us.es/nf-next
 +Q:    http://patchwork.ozlabs.org/project/netfilter-devel/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
  S:    Supported
  F:    include/linux/netfilter*
  F:    include/linux/netfilter/
@@@ -5766,7 -5749,7 +5768,7 @@@ M:      Matthew Wilcox <willy@linux.intel.co
  L:    linux-nvme@lists.infradead.org
  T:    git git://git.infradead.org/users/willy/linux-nvme.git
  S:    Supported
 -F:    drivers/block/nvme.c
 +F:    drivers/block/nvme*
  F:    include/linux/nvme.h
  
  OMAP SUPPORT
@@@ -6095,18 -6078,9 +6097,18 @@@ L:    linux-parisc@vger.kernel.or
  W:    http://www.parisc-linux.org/
  Q:    http://patchwork.kernel.org/project/linux-parisc/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git
  S:    Maintained
  F:    arch/parisc/
 +F:    Documentation/parisc/
  F:    drivers/parisc/
 +F:    drivers/char/agp/parisc-agp.c
 +F:    drivers/input/serio/gscps2.c
 +F:    drivers/parport/parport_gsc.*
 +F:    drivers/tty/serial/8250/8250_gsc.c
 +F:    drivers/video/sti*
 +F:    drivers/video/console/sti*
 +F:    drivers/video/logo/logo_parisc*
  
  PC87360 HARDWARE MONITORING DRIVER
  M:    Jim Cromie <jim.cromie@gmail.com>
@@@ -7624,7 -7598,7 +7626,7 @@@ F:      drivers/clk/spear
  SPI SUBSYSTEM
  M:    Mark Brown <broonie@kernel.org>
  M:    Grant Likely <grant.likely@linaro.org>
 -L:    spi-devel-general@lists.sourceforge.net
 +L:    linux-spi@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
  Q:    http://patchwork.kernel.org/project/spi-devel-general/list/
  S:    Maintained
@@@ -9004,7 -8978,7 +9006,7 @@@ S:      Maintaine
  F:    drivers/net/wireless/wl3501*
  
  WM97XX TOUCHSCREEN DRIVERS
 -M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
 +M:    Mark Brown <broonie@kernel.org>
  M:    Liam Girdwood <lrg@slimlogic.co.uk>
  L:    linux-input@vger.kernel.org
  T:    git git://opensource.wolfsonmicro.com/linux-2.6-touch
@@@ -9014,6 -8988,7 +9016,6 @@@ F:      drivers/input/touchscreen/*wm97
  F:    include/linux/wm97xx.h
  
  WOLFSON MICROELECTRONICS DRIVERS
 -M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
  L:    patches@opensource.wolfsonmicro.com
  T:    git git://opensource.wolfsonmicro.com/linux-2.6-asoc
  T:    git git://opensource.wolfsonmicro.com/linux-2.6-audioplus