diff options
author | David S. Miller <davem@davemloft.net> | 2013-02-08 18:02:14 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-02-08 18:02:14 -0500 |
commit | fd5023111cf720db890ef34f305ac5d427e690a0 (patch) | |
tree | 4d21e9a02bfbdafe5fc598af0755db791238dbe7 /MAINTAINERS | |
parent | 8b9a4d56866e0dca6ae886ed9bff777e50d0b70c (diff) | |
parent | 836dc9e3fbbab0c30aa6e664417225f5c1fb1c39 (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-- | MAINTAINERS | 4 |
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 | |||
1489 | M: Haavard Skinnemoen <hskinnemoen@gmail.com> | 1489 | M: Haavard Skinnemoen <hskinnemoen@gmail.com> |
1490 | M: Hans-Christian Egtvedt <egtvedt@samfundet.no> | 1490 | M: Hans-Christian Egtvedt <egtvedt@samfundet.no> |
1491 | W: http://www.atmel.com/products/AVR32/ | 1491 | W: http://www.atmel.com/products/AVR32/ |
1492 | W: http://avr32linux.org/ | 1492 | W: http://mirror.egtvedt.no/avr32linux.org/ |
1493 | W: http://avrfreaks.net/ | 1493 | W: http://avrfreaks.net/ |
1494 | S: Maintained | 1494 | S: Maintained |
1495 | F: arch/avr32/ | 1495 | F: arch/avr32/ |
@@ -7076,7 +7076,7 @@ F: include/uapi/sound/ | |||
7076 | F: sound/ | 7076 | F: sound/ |
7077 | 7077 | ||
7078 | SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) | 7078 | SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) |
7079 | M: Liam Girdwood <lrg@ti.com> | 7079 | M: Liam Girdwood <lgirdwood@gmail.com> |
7080 | M: Mark Brown <broonie@opensource.wolfsonmicro.com> | 7080 | M: Mark Brown <broonie@opensource.wolfsonmicro.com> |
7081 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git | 7081 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git |
7082 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) | 7082 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) |