aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index fd9959c174e8..43dbae19838b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2966,7 +2966,7 @@ S: Maintained
2966F: drivers/net/ethernet/i825xx/eexpress.* 2966F: drivers/net/ethernet/i825xx/eexpress.*
2967 2967
2968ETHERNET BRIDGE 2968ETHERNET BRIDGE
2969M: Stephen Hemminger <shemminger@vyatta.com> 2969M: Stephen Hemminger <stephen@networkplumber.org>
2970L: bridge@lists.linux-foundation.org 2970L: bridge@lists.linux-foundation.org
2971L: netdev@vger.kernel.org 2971L: netdev@vger.kernel.org
2972W: http://www.linuxfoundation.org/en/Net:Bridge 2972W: http://www.linuxfoundation.org/en/Net:Bridge
@@ -4906,7 +4906,7 @@ S: Maintained
4906 4906
4907MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2) 4907MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2)
4908M: Mirko Lindner <mlindner@marvell.com> 4908M: Mirko Lindner <mlindner@marvell.com>
4909M: Stephen Hemminger <shemminger@vyatta.com> 4909M: Stephen Hemminger <stephen@networkplumber.org>
4910L: netdev@vger.kernel.org 4910L: netdev@vger.kernel.org
4911S: Maintained 4911S: Maintained
4912F: drivers/net/ethernet/marvell/sk* 4912F: drivers/net/ethernet/marvell/sk*
@@ -5181,7 +5181,7 @@ S: Supported
5181F: drivers/infiniband/hw/nes/ 5181F: drivers/infiniband/hw/nes/
5182 5182
5183NETEM NETWORK EMULATOR 5183NETEM NETWORK EMULATOR
5184M: Stephen Hemminger <shemminger@vyatta.com> 5184M: Stephen Hemminger <stephen@networkplumber.org>
5185L: netem@lists.linux-foundation.org 5185L: netem@lists.linux-foundation.org
5186S: Maintained 5186S: Maintained
5187F: net/sched/sch_netem.c 5187F: net/sched/sch_netem.c
@@ -7089,7 +7089,7 @@ F: include/uapi/sound/
7089F: sound/ 7089F: sound/
7090 7090
7091SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) 7091SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
7092M: Liam Girdwood <lrg@ti.com> 7092M: Liam Girdwood <lgirdwood@gmail.com>
7093M: Mark Brown <broonie@opensource.wolfsonmicro.com> 7093M: Mark Brown <broonie@opensource.wolfsonmicro.com>
7094T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 7094T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
7095L: alsa-devel@alsa-project.org (moderated for non-subscribers) 7095L: alsa-devel@alsa-project.org (moderated for non-subscribers)