bpf: update MAINTAINERS entry

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c411c40d8854557a870b27e34dc24756540b9d3a..62bf15f6954fb5222d3cd5a2a87382ef5a48954d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -156,7 +156,6 @@ F:  drivers/net/hamradio/6pack.c
 
 8169 10/100/1000 GIGABIT ETHERNET DRIVER
 M:     Realtek linux nic maintainers <[email protected]>
-M:     Francois Romieu <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     drivers/net/ethernet/realtek/r8169.c
@@ -1314,6 +1313,20 @@ W:       http://oss.renesas.com
 Q:     http://patchwork.kernel.org/project/linux-sh/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
 S:     Supported
+F:     arch/arm/boot/dts/emev2*
+F:     arch/arm/boot/dts/r7s*
+F:     arch/arm/boot/dts/r8a*
+F:     arch/arm/boot/dts/sh*
+F:     arch/arm/configs/ape6evm_defconfig
+F:     arch/arm/configs/armadillo800eva_defconfig
+F:     arch/arm/configs/bockw_defconfig
+F:     arch/arm/configs/genmai_defconfig
+F:     arch/arm/configs/koelsch_defconfig
+F:     arch/arm/configs/kzm9g_defconfig
+F:     arch/arm/configs/lager_defconfig
+F:     arch/arm/configs/mackerel_defconfig
+F:     arch/arm/configs/marzen_defconfig
+F:     arch/arm/configs/shmobile_defconfig
 F:     arch/arm/mach-shmobile/
 F:     drivers/sh/
 
@@ -1899,6 +1912,13 @@ S:       Supported
 F:     drivers/net/bonding/
 F:     include/uapi/linux/if_bonding.h
 
+BPF (Safe dynamic programs and tools)
+M:     Alexei Starovoitov <[email protected]>
+L:     [email protected]
+L:     [email protected]
+S:     Supported
+F:     kernel/bpf/
+
 BROADCOM B44 10/100 ETHERNET DRIVER
 M:     Gary Zambrano <[email protected]>
 L:     [email protected]
@@ -1912,7 +1932,8 @@ S:        Supported
 F:     drivers/net/ethernet/broadcom/genet/
 
 BROADCOM BNX2 GIGABIT ETHERNET DRIVER
-M:     Michael Chan <[email protected]>
+M:     Sony Chacko <[email protected]>
+M:     [email protected]
 L:     [email protected]
 S:     Supported
 F:     drivers/net/ethernet/broadcom/bnx2.*
@@ -1957,7 +1978,7 @@ F:        arch/arm/boot/dts/bcm5301x.dtsi
 F:     arch/arm/boot/dts/bcm470*
 
 BROADCOM TG3 GIGABIT ETHERNET DRIVER
-M:     Nithin Nayak Sujir <nsujir@broadcom.com>
+M:     Prashant Sreedharan <prashant@broadcom.com>
 M:     Michael Chan <[email protected]>
 L:     [email protected]
 S:     Supported
@@ -4497,8 +4518,7 @@ S:        Supported
 F:     drivers/idle/i7300_idle.c
 
 IEEE 802.15.4 SUBSYSTEM
-M:     Alexander Smirnov <[email protected]>
-M:     Dmitry Eremin-Solenikov <[email protected]>
+M:     Alexander Aring <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
 W:     http://apps.sourceforge.net/trac/linux-zigbee
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git
@@ -5643,16 +5663,6 @@ F:       Documentation/networking/mac80211-injection.txt
 F:     include/net/mac80211.h
 F:     net/mac80211/
 
-MAC80211 PID RATE CONTROL
-M:     Stefano Brivio <[email protected]>
-M:     Mattias Nissler <[email protected]>
-L:     [email protected]
-W:     http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
-S:     Maintained
-F:     net/mac80211/rc80211_pid*
-
 MACVLAN DRIVER
 M:     Patrick McHardy <[email protected]>
 L:     [email protected]
@@ -8007,6 +8017,16 @@ F:       drivers/ata/
 F:     include/linux/ata.h
 F:     include/linux/libata.h
 
+SERIAL ATA AHCI PLATFORM devices support
+M:     Hans de Goede <[email protected]>
+M:     Tejun Heo <[email protected]>
+L:     [email protected]
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
+S:     Supported
+F:     drivers/ata/ahci_platform.c
+F:     drivers/ata/libahci_platform.c
+F:     include/linux/ahci_platform.h
+
 SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
 M:     Jayamohan Kallickal <[email protected]>
 L:     [email protected]