diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-21 13:29:05 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-21 13:29:05 +1000 |
| commit | 1417ed704fffc2bc9b302294891485add56e5676 (patch) | |
| tree | 40d6d5a4c26f829ea57a0e3c7c32f1bd527b3b02 /MAINTAINERS | |
| parent | 56835bc8423db0dee412c608769380c9ec451e8b (diff) | |
| parent | a9f559c37b582c9eb12f82ac9bb77476cfda6309 (diff) | |
next-20140717/net-next
Conflicts:
drivers/infiniband/hw/cxgb4/device.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b6eeb4ef2553..8fdc5c2ef9e4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1924,7 +1924,8 @@ S: Supported F: drivers/net/ethernet/broadcom/genet/ BROADCOM BNX2 GIGABIT ETHERNET DRIVER -M: Michael Chan <mchan@broadcom.com> +M: Sony Chacko <sony.chacko@qlogic.com> +M: Dept-HSGLinuxNICDev@qlogic.com L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/broadcom/bnx2.* @@ -1969,7 +1970,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 <mchan@broadcom.com> L: netdev@vger.kernel.org S: Supported @@ -5655,16 +5656,6 @@ F: Documentation/networking/mac80211-injection.txt F: include/net/mac80211.h F: net/mac80211/ -MAC80211 PID RATE CONTROL -M: Stefano Brivio <stefano.brivio@polimi.it> -M: Mattias Nissler <mattias.nissler@gmx.de> -L: linux-wireless@vger.kernel.org -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 <kaber@trash.net> L: netdev@vger.kernel.org |