diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-05-22 10:01:33 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-05-22 10:01:33 +0200 |
| commit | 7ec298dfef00e2c8effe8658011e03d86911b0bf (patch) | |
| tree | dd62232006547b861a2731fe49c26367d3e9422c /MAINTAINERS | |
| parent | 02e5fbf622aabf68bdc02282a17a3aeed054237a (diff) | |
| parent | de0853c000aa3b5c9983d066c137e5dc9c8355a0 (diff) | |
| download | linux-3.10-7ec298dfef00e2c8effe8658011e03d86911b0bf.tar.gz linux-3.10-7ec298dfef00e2c8effe8658011e03d86911b0bf.tar.bz2 linux-3.10-7ec298dfef00e2c8effe8658011e03d86911b0bf.zip | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3dbf9833e47..6e645474654 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5854,7 +5854,7 @@ F: include/sound/ F: sound/ SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) -M: Liam Girdwood <lrg@slimlogic.co.uk> +M: Liam Girdwood <lrg@ti.com> M: Mark Brown <broonie@opensource.wolfsonmicro.com> T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git L: alsa-devel@alsa-project.org (moderated for non-subscribers) @@ -6105,7 +6105,7 @@ F: drivers/mmc/host/tifm_sd.c F: include/linux/tifm.h TI TWL4030 SERIES SOC CODEC DRIVER -M: Peter Ujfalusi <peter.ujfalusi@nokia.com> +M: Peter Ujfalusi <peter.ujfalusi@ti.com> L: alsa-devel@alsa-project.org (moderated for non-subscribers) S: Maintained F: sound/soc/codecs/twl4030* @@ -6749,7 +6749,7 @@ F: drivers/scsi/vmw_pvscsi.c F: drivers/scsi/vmw_pvscsi.h VOLTAGE AND CURRENT REGULATOR FRAMEWORK -M: Liam Girdwood <lrg@slimlogic.co.uk> +M: Liam Girdwood <lrg@ti.com> M: Mark Brown <broonie@opensource.wolfsonmicro.com> W: http://opensource.wolfsonmicro.com/node/15 W: http://www.slimlogic.co.uk/?p=48 |