Merge 3.14-rc3 into staging-next

We want the fixes in this branch to make testing and future work easier.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 2af6445fd9e7..9e484c081b8a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2367,7 +2367,7 @@ F:	include/linux/cpufreq.h
 
 CPU FREQUENCY DRIVERS - ARM BIG LITTLE
 M:      Viresh Kumar <viresh.kumar@linaro.org>
-M:      Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
+M:      Sudeep Holla <sudeep.holla@arm.com>
 L:      cpufreq@vger.kernel.org
 L:      linux-pm@vger.kernel.org
 W:      http://www.arm.com/products/processors/technologies/biglittleprocessing.php
@@ -2857,7 +2857,7 @@ M:	Jani Nikula <jani.nikula@linux.intel.com>
 L:      intel-gfx@lists.freedesktop.org
 L:      dri-devel@lists.freedesktop.org
 Q:      http://patchwork.freedesktop.org/project/intel-gfx/
-T:      git git://people.freedesktop.org/~danvet/drm-intel
+T:      git git://anongit.freedesktop.org/drm-intel
 S:      Supported
 F:      drivers/gpu/drm/i915/
 F:      include/drm/i915*
@@ -7196,7 +7196,7 @@ S:	Maintained
 F:      drivers/net/ethernet/rdc/r6040.c
 
 RDS - RELIABLE DATAGRAM SOCKETS
-M:      Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
+M:      Chien Yen <chien.yen@oracle.com>
 L:      rds-devel@oss.oracle.com (moderated for non-subscribers)
 S:      Supported
 F:      net/rds/