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

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
Linus Torvalds
2 parents 3bd1911b13 b0b8daf784
Showing 1 changed file Side-by-side Diff
MAINTAINERS
@@ -3833,11 +3833,12 @@
  
 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
...	...	@@ -3833,11 +3833,12 @@
3833	3833
3834	3834	SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT
3835	3835	P: Liam Girdwood
3836		-M: liam.girdwood@wolfsonmicro.com
	3836	+M: lrg@slimlogic.co.uk
3837	3837	P: Mark Brown
3838	3838	M: broonie@opensource.wolfsonmicro.com
3839	3839	T: git opensource.wolfsonmicro.com/linux-2.6-asoc
3840	3840	L: alsa-devel@alsa-project.org (subscribers-only)
	3841	+W: http://alsa-project.org/main/index.php/ASoC
3841	3842	S: Supported
3842	3843
3843	3844	SPI SUBSYSTEM