diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-23 13:21:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-23 13:21:45 -0400 |
| commit | 42e7b09e688bf86c032ca36ddb65cc548bb6147f (patch) | |
| tree | 64b13ebb52a9f245dc6628c11a417069ddb192c4 /MAINTAINERS | |
| parent | 3bd1911b134ce4a669ea6cf531a36440753b0aaa (diff) | |
| parent | b0b8daf7849cc98217ca018fbe82c61cd2b735bc (diff) | |
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-- | MAINTAINERS | 3 |
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 | |||
| 3833 | 3833 | ||
| 3834 | SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT | 3834 | SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT |
| 3835 | P: Liam Girdwood | 3835 | P: Liam Girdwood |
| 3836 | M: liam.girdwood@wolfsonmicro.com | 3836 | M: lrg@slimlogic.co.uk |
| 3837 | P: Mark Brown | 3837 | P: Mark Brown |
| 3838 | M: broonie@opensource.wolfsonmicro.com | 3838 | M: broonie@opensource.wolfsonmicro.com |
| 3839 | T: git opensource.wolfsonmicro.com/linux-2.6-asoc | 3839 | T: git opensource.wolfsonmicro.com/linux-2.6-asoc |
| 3840 | L: alsa-devel@alsa-project.org (subscribers-only) | 3840 | L: alsa-devel@alsa-project.org (subscribers-only) |
| 3841 | W: http://alsa-project.org/main/index.php/ASoC | ||
| 3841 | S: Supported | 3842 | S: Supported |
| 3842 | 3843 | ||
| 3843 | SPI SUBSYSTEM | 3844 | SPI SUBSYSTEM |