summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-11 11:17:14 +0100
committerMark Brown <broonie@linaro.org>2013-09-11 11:17:14 +0100
commit29dc5dd229dc3130b51df0932e59946fc09d3bd4 (patch)
tree51fbe8eb543fc4fd3f8ee6582bdc72ea0bccee6f /MAINTAINERS
parent6e4664525b1db28f8c4e1130957f70a94c19213e (diff)
parente011143454606de70eba1db5d99454eec0017fdb (diff)
downloadop-kernel-dev-29dc5dd229dc3130b51df0932e59946fc09d3bd4.zip
op-kernel-dev-29dc5dd229dc3130b51df0932e59946fc09d3bd4.tar.gz
Merge remote-tracking branch 'asoc/fix/atmel' into asoc-linus
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index b140c81..b5e0912 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -595,6 +595,7 @@ S: Supported
F: sound/soc/codecs/adau*
F: sound/soc/codecs/adav*
F: sound/soc/codecs/ad1*
+F: sound/soc/codecs/ad7*
F: sound/soc/codecs/ssm*
F: sound/soc/codecs/sigmadsp.*
@@ -7682,6 +7683,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
W: http://alsa-project.org/main/index.php/ASoC
S: Supported
+F: Documentation/sound/alsa/soc/
F: sound/soc/
F: include/sound/soc*
OpenPOWER on IntegriCloud