diff options
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 10 |
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 | |||
| 2966 | F: drivers/net/ethernet/i825xx/eexpress.* | 2966 | F: drivers/net/ethernet/i825xx/eexpress.* |
| 2967 | 2967 | ||
| 2968 | ETHERNET BRIDGE | 2968 | ETHERNET BRIDGE |
| 2969 | M: Stephen Hemminger <shemminger@vyatta.com> | 2969 | M: Stephen Hemminger <stephen@networkplumber.org> |
| 2970 | L: bridge@lists.linux-foundation.org | 2970 | L: bridge@lists.linux-foundation.org |
| 2971 | L: netdev@vger.kernel.org | 2971 | L: netdev@vger.kernel.org |
| 2972 | W: http://www.linuxfoundation.org/en/Net:Bridge | 2972 | W: http://www.linuxfoundation.org/en/Net:Bridge |
| @@ -4914,7 +4914,7 @@ S: Maintained | |||
| 4914 | 4914 | ||
| 4915 | MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2) | 4915 | MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2) |
| 4916 | M: Mirko Lindner <mlindner@marvell.com> | 4916 | M: Mirko Lindner <mlindner@marvell.com> |
| 4917 | M: Stephen Hemminger <shemminger@vyatta.com> | 4917 | M: Stephen Hemminger <stephen@networkplumber.org> |
| 4918 | L: netdev@vger.kernel.org | 4918 | L: netdev@vger.kernel.org |
| 4919 | S: Maintained | 4919 | S: Maintained |
| 4920 | F: drivers/net/ethernet/marvell/sk* | 4920 | F: drivers/net/ethernet/marvell/sk* |
| @@ -5189,7 +5189,7 @@ S: Supported | |||
| 5189 | F: drivers/infiniband/hw/nes/ | 5189 | F: drivers/infiniband/hw/nes/ |
| 5190 | 5190 | ||
| 5191 | NETEM NETWORK EMULATOR | 5191 | NETEM NETWORK EMULATOR |
| 5192 | M: Stephen Hemminger <shemminger@vyatta.com> | 5192 | M: Stephen Hemminger <stephen@networkplumber.org> |
| 5193 | L: netem@lists.linux-foundation.org | 5193 | L: netem@lists.linux-foundation.org |
| 5194 | S: Maintained | 5194 | S: Maintained |
| 5195 | F: net/sched/sch_netem.c | 5195 | F: net/sched/sch_netem.c |
| @@ -6594,7 +6594,7 @@ F: drivers/media/platform/s3c-camif/ | |||
| 6594 | F: include/media/s3c_camif.h | 6594 | F: include/media/s3c_camif.h |
| 6595 | 6595 | ||
| 6596 | SERIAL DRIVERS | 6596 | SERIAL DRIVERS |
| 6597 | M: Alan Cox <alan@linux.intel.com> | 6597 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| 6598 | L: linux-serial@vger.kernel.org | 6598 | L: linux-serial@vger.kernel.org |
| 6599 | S: Maintained | 6599 | S: Maintained |
| 6600 | F: drivers/tty/serial | 6600 | F: drivers/tty/serial |
| @@ -7097,7 +7097,7 @@ F: include/uapi/sound/ | |||
| 7097 | F: sound/ | 7097 | F: sound/ |
| 7098 | 7098 | ||
| 7099 | SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) | 7099 | SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) |
| 7100 | M: Liam Girdwood <lrg@ti.com> | 7100 | M: Liam Girdwood <lgirdwood@gmail.com> |
| 7101 | M: Mark Brown <broonie@opensource.wolfsonmicro.com> | 7101 | M: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| 7102 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git | 7102 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git |
| 7103 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) | 7103 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) |
