diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-25 09:28:14 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-25 09:28:14 -0400 |
| commit | 10121a12e2380fb34b6e646a8e367add06d036c3 (patch) | |
| tree | d500294174e67cbb208eaf5d7f9741be48eca8a6 /MAINTAINERS | |
| parent | 28d0325ce6e0a52f53d8af687e6427fee59004d3 (diff) | |
| parent | dd5e8e6b1d4c218d2bafe002231ec460459ab5c4 (diff) | |
Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
Conflicts:
MAINTAINERS
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fa2a16def17a..3ba68dc9fe48 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5668,6 +5668,13 @@ F: drivers/misc/tifm* | |||
| 5668 | F: drivers/mmc/host/tifm_sd.c | 5668 | F: drivers/mmc/host/tifm_sd.c |
| 5669 | F: include/linux/tifm.h | 5669 | F: include/linux/tifm.h |
| 5670 | 5670 | ||
| 5671 | TI TWL4030 SERIES SOC CODEC DRIVER | ||
| 5672 | P: Peter Ujfalusi | ||
| 5673 | M: peter.ujfalusi@nokia.com | ||
| 5674 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) | ||
| 5675 | S: Maintained | ||
| 5676 | F: sound/soc/codecs/twl4030* | ||
| 5677 | |||
| 5671 | TIPC NETWORK LAYER | 5678 | TIPC NETWORK LAYER |
| 5672 | P: Per Liden | 5679 | P: Per Liden |
| 5673 | M: per.liden@ericsson.com | 5680 | M: per.liden@ericsson.com |