projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
[cascardo/linux.git]
/
MAINTAINERS
diff --git
a/MAINTAINERS
b/MAINTAINERS
index
6781a3f
..
01bff8e
100644
(file)
--- a/
MAINTAINERS
+++ b/
MAINTAINERS
@@
-1625,6
+1625,7
@@
N: rockchip
ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
M: Kukjin Kim <kgene@kernel.org>
M: Krzysztof Kozlowski <krzk@kernel.org>
ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
M: Kukjin Kim <kgene@kernel.org>
M: Krzysztof Kozlowski <krzk@kernel.org>
+R: Javier Martinez Canillas <javier@osg.samsung.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
S: Maintained
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
S: Maintained
@@
-2485,7
+2486,7
@@
F: include/net/bluetooth/
BONDING DRIVER
M: Jay Vosburgh <j.vosburgh@gmail.com>
M: Veaceslav Falico <vfalico@gmail.com>
BONDING DRIVER
M: Jay Vosburgh <j.vosburgh@gmail.com>
M: Veaceslav Falico <vfalico@gmail.com>
-M: Andy Gospodarek <
gospo@cumulusnetworks.com
>
+M: Andy Gospodarek <
andy@greyhouse.net
>
L: netdev@vger.kernel.org
W: http://sourceforge.net/projects/bonding/
S: Supported
L: netdev@vger.kernel.org
W: http://sourceforge.net/projects/bonding/
S: Supported
@@
-2500,7
+2501,7
@@
S: Supported
F: kernel/bpf/
BROADCOM B44 10/100 ETHERNET DRIVER
F: kernel/bpf/
BROADCOM B44 10/100 ETHERNET DRIVER
-M:
Gary Zambrano <zambrano
@broadcom.com>
+M:
Michael Chan <michael.chan
@broadcom.com>
L: netdev@vger.kernel.org
S: Supported
F: drivers/net/ethernet/broadcom/b44.*
L: netdev@vger.kernel.org
S: Supported
F: drivers/net/ethernet/broadcom/b44.*
@@
-3269,7
+3270,7
@@
S: Maintained
F: drivers/net/wan/cosa*
CPMAC ETHERNET DRIVER
F: drivers/net/wan/cosa*
CPMAC ETHERNET DRIVER
-M: Florian Fainelli <f
lorian@openwrt.org
>
+M: Florian Fainelli <f
.fainelli@gmail.com
>
L: netdev@vger.kernel.org
S: Maintained
F: drivers/net/ethernet/ti/cpmac.c
L: netdev@vger.kernel.org
S: Maintained
F: drivers/net/ethernet/ti/cpmac.c
@@
-6102,7
+6103,7
@@
S: Supported
F: drivers/cpufreq/intel_pstate.c
INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
F: drivers/cpufreq/intel_pstate.c
INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
-M: Maik Broemme <mbroemme@
plusserver.de
>
+M: Maik Broemme <mbroemme@
libmpq.org
>
L: linux-fbdev@vger.kernel.org
S: Maintained
F: Documentation/fb/intelfb.txt
L: linux-fbdev@vger.kernel.org
S: Maintained
F: Documentation/fb/intelfb.txt
@@
-8160,6
+8161,15
@@
S: Maintained
W: https://fedorahosted.org/dropwatch/
F: net/core/drop_monitor.c
W: https://fedorahosted.org/dropwatch/
F: net/core/drop_monitor.c
+NETWORKING [DSA]
+M: Andrew Lunn <andrew@lunn.ch>
+M: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
+M: Florian Fainelli <f.fainelli@gmail.com>
+S: Maintained
+F: net/dsa/
+F: include/net/dsa.h
+F: drivers/net/dsa/
+
NETWORKING [GENERAL]
M: "David S. Miller" <davem@davemloft.net>
L: netdev@vger.kernel.org
NETWORKING [GENERAL]
M: "David S. Miller" <davem@davemloft.net>
L: netdev@vger.kernel.org
@@
-12568,7
+12578,7
@@
F: include/linux/if_*vlan.h
F: net/8021q/
VLYNQ BUS
F: net/8021q/
VLYNQ BUS
-M: Florian Fainelli <f
lorian@openwrt.org
>
+M: Florian Fainelli <f
.fainelli@gmail.com
>
L: openwrt-devel@lists.openwrt.org (subscribers-only)
S: Maintained
F: drivers/vlynq/vlynq.c
L: openwrt-devel@lists.openwrt.org (subscribers-only)
S: Maintained
F: drivers/vlynq/vlynq.c