diff --git a/[refs] b/[refs] index 2837b62b7c9d..7ec42001571a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d955ebd4db7961dc4e772a23288b3d5c6f191be +refs/heads/master: ae77b4ed4fd11e67f8b02ca7ee882a636ee20a97 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index fa2a16def17a..3ba68dc9fe48 100644 --- a/trunk/MAINTAINERS +++ b/trunk/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