aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-02-08 18:02:14 -0500
committerDavid S. Miller <davem@davemloft.net>2013-02-08 18:02:14 -0500
commitfd5023111cf720db890ef34f305ac5d427e690a0 (patch)
tree4d21e9a02bfbdafe5fc598af0755db791238dbe7 /MAINTAINERS
parent8b9a4d56866e0dca6ae886ed9bff777e50d0b70c (diff)
parent836dc9e3fbbab0c30aa6e664417225f5c1fb1c39 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Synchronize with 'net' in order to sort out some l2tp, wireless, and ipv6 GRE fixes that will be built on top of in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index b5ab4d9a48a7..5abc10efffa2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1489,7 +1489,7 @@ AVR32 ARCHITECTURE
1489M: Haavard Skinnemoen <hskinnemoen@gmail.com> 1489M: Haavard Skinnemoen <hskinnemoen@gmail.com>
1490M: Hans-Christian Egtvedt <egtvedt@samfundet.no> 1490M: Hans-Christian Egtvedt <egtvedt@samfundet.no>
1491W: http://www.atmel.com/products/AVR32/ 1491W: http://www.atmel.com/products/AVR32/
1492W: http://avr32linux.org/ 1492W: http://mirror.egtvedt.no/avr32linux.org/
1493W: http://avrfreaks.net/ 1493W: http://avrfreaks.net/
1494S: Maintained 1494S: Maintained
1495F: arch/avr32/ 1495F: arch/avr32/
@@ -7076,7 +7076,7 @@ F: include/uapi/sound/
7076F: sound/ 7076F: sound/
7077 7077
7078SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) 7078SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
7079M: Liam Girdwood <lrg@ti.com> 7079M: Liam Girdwood <lgirdwood@gmail.com>
7080M: Mark Brown <broonie@opensource.wolfsonmicro.com> 7080M: Mark Brown <broonie@opensource.wolfsonmicro.com>
7081T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 7081T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
7082L: alsa-devel@alsa-project.org (moderated for non-subscribers) 7082L: alsa-devel@alsa-project.org (moderated for non-subscribers)