aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS10
1 files changed, 5 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 845becb8d6ef..38fe0ffc5f16 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
@@ -4914,7 +4914,7 @@ S: Maintained
4914 4914
4915MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2) 4915MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2)
4916M: Mirko Lindner <mlindner@marvell.com> 4916M: Mirko Lindner <mlindner@marvell.com>
4917M: Stephen Hemminger <shemminger@vyatta.com> 4917M: Stephen Hemminger <stephen@networkplumber.org>
4918L: netdev@vger.kernel.org 4918L: netdev@vger.kernel.org
4919S: Maintained 4919S: Maintained
4920F: drivers/net/ethernet/marvell/sk* 4920F: drivers/net/ethernet/marvell/sk*
@@ -5189,7 +5189,7 @@ S: Supported
5189F: drivers/infiniband/hw/nes/ 5189F: drivers/infiniband/hw/nes/
5190 5190
5191NETEM NETWORK EMULATOR 5191NETEM NETWORK EMULATOR
5192M: Stephen Hemminger <shemminger@vyatta.com> 5192M: Stephen Hemminger <stephen@networkplumber.org>
5193L: netem@lists.linux-foundation.org 5193L: netem@lists.linux-foundation.org
5194S: Maintained 5194S: Maintained
5195F: net/sched/sch_netem.c 5195F: net/sched/sch_netem.c
@@ -6594,7 +6594,7 @@ F: drivers/media/platform/s3c-camif/
6594F: include/media/s3c_camif.h 6594F: include/media/s3c_camif.h
6595 6595
6596SERIAL DRIVERS 6596SERIAL DRIVERS
6597M: Alan Cox <alan@linux.intel.com> 6597M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
6598L: linux-serial@vger.kernel.org 6598L: linux-serial@vger.kernel.org
6599S: Maintained 6599S: Maintained
6600F: drivers/tty/serial 6600F: drivers/tty/serial
@@ -7097,7 +7097,7 @@ F: include/uapi/sound/
7097F: sound/ 7097F: sound/
7098 7098
7099SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) 7099SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
7100M: Liam Girdwood <lrg@ti.com> 7100M: Liam Girdwood <lgirdwood@gmail.com>
7101M: Mark Brown <broonie@opensource.wolfsonmicro.com> 7101M: Mark Brown <broonie@opensource.wolfsonmicro.com>
7102T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 7102T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
7103L: alsa-devel@alsa-project.org (moderated for non-subscribers) 7103L: alsa-devel@alsa-project.org (moderated for non-subscribers)