Merge 3.14-rc4 into staging-next.

We want those fixes here as well.

1 files changed, 14 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 9e484c081b8a..b44ae3bfa55f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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
@@ -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
@@ -3324,6 +3327,17 @@ S:	Maintained
 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
@@ -9721,7 +9735,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