Merge 3.14-rc5 into staging-next

We want those fixes in here

1 files changed, 20 insertions, 5 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index b44ae3bfa55f..c3ff6236fca8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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
@@ -2611,9 +2611,9 @@ DC395x SCSI driver
 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 +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>
@@ -5501,6 +5511,11 @@ W:	http://www.kernel.org/doc/man-pages
 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>
@@ -8449,8 +8464,8 @@ TARGET SUBSYSTEM
 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/