aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-23 10:21:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-23 10:21:45 -0700
commit42e7b09e688bf86c032ca36ddb65cc548bb6147f (patch)
tree64b13ebb52a9f245dc6628c11a417069ddb192c4 /MAINTAINERS
parent3bd1911b134ce4a669ea6cf531a36440753b0aaa (diff)
parentb0b8daf7849cc98217ca018fbe82c61cd2b735bc (diff)
downloadlinux-linaro-stable-42e7b09e688bf86c032ca36ddb65cc548bb6147f.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: ASoC: maintainers - update email address for Liam Girdwood
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index cad81a24e832..42ebbfdc350b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3833,11 +3833,12 @@ S: Maintained
SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT
P: Liam Girdwood
-M: liam.girdwood@wolfsonmicro.com
+M: lrg@slimlogic.co.uk
P: Mark Brown
M: broonie@opensource.wolfsonmicro.com
T: git opensource.wolfsonmicro.com/linux-2.6-asoc
L: alsa-devel@alsa-project.org (subscribers-only)
+W: http://alsa-project.org/main/index.php/ASoC
S: Supported
SPI SUBSYSTEM