Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes from Dave Airlie:
 "Not a huge amount happening, some MAINTAINERS updates, radeon, vmwgfx
  and tegra fixes"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/vmwgfx: avoid null pointer dereference at failure paths
  drm/vmwgfx: Make sure backing mobs are cleared when allocated. Update driver date.
  drm/vmwgfx: Remove some unused surface formats
  drm/radeon: enable speaker allocation setup on dce3.2
  drm/radeon: change audio enable logic
  drm/radeon: fix audio disable on dce6+
  drm/radeon: free uvd ring on unload
  drm/radeon: disable pll sharing for DP on DCE4.1
  drm/radeon: fix missing bo reservation
  drm/radeon: print the supported atpx function mask
  MAINTAINERS: update drm git tree entry
  MAINTAINERS: add entry for drm radeon driver
  drm/tegra: Add guard to avoid double disable/enable of RGB outputs
  gpu: host1x: do not check previously handled gathers
  drm/tegra: fix typo 'CONFIG_TEGRA_DRM_FBDEV'

diff --combined MAINTAINERS
index 4f42aceacc431a3b87fcff080e29b13a2da1f82c,623ba85c9d171f4758e616c7c1dd4952f31c6e9d..c6d0e93eff62d700443b93dff01120d36d2ce52a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -538,7 -538,7 +538,7 @@@ F: arch/alpha
  ALTERA UART/JTAG UART SERIAL DRIVERS
  M:    Tobias Klauser <tklauser@distanz.ch>
  L:    linux-serial@vger.kernel.org
 -L:    nios2-dev@sopc.et.ntust.edu.tw (moderated for non-subscribers)
 +L:    nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/tty/serial/altera_uart.c
  F:    drivers/tty/serial/altera_jtaguart.c
@@@ -1860,7 -1860,6 +1860,7 @@@ F:      drivers/net/ethernet/broadcom/bnx2x
  
  BROADCOM BCM281XX/BCM11XXX ARM ARCHITECTURE
  M:    Christian Daudt <bcm@fixthebug.org>
 +M:    Matt Porter <mporter@linaro.org>
  L:    bcm-kernel-feedback-list@broadcom.com
  T:    git git://git.github.com/broadcom/bcm11351
  S:    Maintained
@@@ -2409,10 -2408,8 +2409,10 @@@ F:    tools/power/cpupower
  
  CPUSETS
  M:    Li Zefan <lizefan@huawei.com>
 +L:    cgroups@vger.kernel.org
  W:    http://www.bullopensource.org/cpuset/
  W:    http://oss.sgi.com/projects/cpusets/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
  S:    Maintained
  F:    Documentation/cgroups/cpusets.txt
  F:    include/linux/cpuset.h
@@@ -2611,9 -2608,9 +2611,9 @@@ DC395x SCSI drive
  M:    Oliver Neukum <oliver@neukum.org>
  M:    Ali Akcaagac <aliakc@web.de>
  M:    Jamie Lenehan <lenehan@twibble.org>
 -W:    http://twibble.org/dist/dc395x/
  L:    dc395x@twibble.org
 -L:    http://lists.twibble.org/mailman/listinfo/dc395x/
 +W:    http://twibble.org/dist/dc395x/
 +W:    http://lists.twibble.org/mailman/listinfo/dc395x/
  S:    Maintained
  F:    Documentation/scsi/dc395x.txt
  F:    drivers/scsi/dc395x.*
@@@ -2848,12 -2845,22 +2848,22 @@@ F:   lib/kobj
  DRM DRIVERS
  M:    David Airlie <airlied@linux.ie>
  L:    dri-devel@lists.freedesktop.org
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git
+ T:    git git://people.freedesktop.org/~airlied/linux
  S:    Maintained
  F:    drivers/gpu/drm/
  F:    include/drm/
  F:    include/uapi/drm/
  
+ RADEON DRM DRIVERS
+ M:    Alex Deucher <alexander.deucher@amd.com>
+ M:    Christian König <christian.koenig@amd.com>
+ L:    dri-devel@lists.freedesktop.org
+ T:    git git://people.freedesktop.org/~agd5f/linux
+ S:    Supported
+ F:    drivers/gpu/drm/radeon/
+ F:    include/drm/radeon*
+ F:    include/uapi/drm/radeon*
+ 
  INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
  M:    Daniel Vetter <daniel.vetter@ffwll.ch>
  M:    Jani Nikula <jani.nikula@linux.intel.com>
@@@ -3327,17 -3334,6 +3337,17 @@@ S:    Maintaine
  F:    include/linux/netfilter_bridge/
  F:    net/bridge/
  
 +ETHERNET PHY LIBRARY
 +M:    Florian Fainelli <f.fainelli@gmail.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    include/linux/phy.h
 +F:    include/linux/phy_fixed.h
 +F:    drivers/net/phy/
 +F:    Documentation/networking/phy.txt
 +F:    drivers/of/of_mdio.c
 +F:    drivers/of/of_net.c
 +
  EXT2 FILE SYSTEM
  M:    Jan Kara <jack@suse.cz>
  L:    linux-ext4@vger.kernel.org
@@@ -5501,11 -5497,6 +5511,11 @@@ W:    http://www.kernel.org/doc/man-page
  L:    linux-man@vger.kernel.org
  S:    Maintained
  
 +MARVELL ARMADA DRM SUPPORT
 +M:    Russell King <rmk+kernel@arm.linux.org.uk>
 +S:    Maintained
 +F:    drivers/gpu/drm/armada/
 +
  MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2)
  M:    Mirko Lindner <mlindner@marvell.com>
  M:    Stephen Hemminger <stephen@networkplumber.org>
@@@ -8448,8 -8439,8 +8458,8 @@@ TARGET SUBSYSTE
  M:    Nicholas A. Bellinger <nab@linux-iscsi.org>
  L:    linux-scsi@vger.kernel.org
  L:    target-devel@vger.kernel.org
 -L:    http://groups.google.com/group/linux-iscsi-target-dev
  W:    http://www.linux-iscsi.org
 +W:    http://groups.google.com/group/linux-iscsi-target-dev
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master
  S:    Supported
  F:    drivers/target/
@@@ -9734,6 -9725,7 +9744,6 @@@ F:      drivers/xen/*swiotlb
  XFS FILESYSTEM
  P:    Silicon Graphics Inc
  M:    Dave Chinner <david@fromorbit.com>
 -M:    Ben Myers <bpm@sgi.com>
  M:    xfs@oss.sgi.com
  L:    xfs@oss.sgi.com
  W:    http://oss.sgi.com/projects/xfs