projects
/
linux-2.6-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
28d0325
)
Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
author
Takashi Iwai
<tiwai@suse.de>
Thu, 25 Jun 2009 13:28:14 +0000
(15:28 +0200)
committer
Takashi Iwai
<tiwai@suse.de>
Thu, 25 Jun 2009 13:28:14 +0000
(15:28 +0200)
Conflicts:
MAINTAINERS
MAINTAINERS
patch
|
blob
|
blame
|
history
diff --git
a/MAINTAINERS
b/MAINTAINERS
index fa2a16def17afb765ad447f10b5dde634f83ded9..3ba68dc9fe48d4c472271581b82c30494ce01290 100644
(file)
--- a/
MAINTAINERS
+++ b/
MAINTAINERS
@@
-5668,6
+5668,13
@@
F: drivers/misc/tifm*
F: drivers/mmc/host/tifm_sd.c
F: include/linux/tifm.h
+TI TWL4030 SERIES SOC CODEC DRIVER
+P: Peter Ujfalusi
+M: peter.ujfalusi@nokia.com
+L: alsa-devel@alsa-project.org (moderated for non-subscribers)
+S: Maintained
+F: sound/soc/codecs/twl4030*
+
TIPC NETWORK LAYER
P: Per Liden
M: per.liden@ericsson.com