summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/wm2000.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-09-29 12:44:07 -0700
committerMark Brown <broonie@kernel.org>2016-09-29 12:44:07 -0700
commit7c90fc73bf78aa1f390c65f86a43ffae543a248d (patch)
tree0cababbaacf2dc327fc9b0e1a4fb70dea6eb6ff8 /sound/soc/codecs/wm2000.c
parent81af726167a12329409151c01ac439a4cea21189 (diff)
parent52abe54138d9b14b4a0a17742a53d2411bc5b167 (diff)
parentc14c59f2e9ca2dc3ddb3af67b71a11feaaacbbce (diff)
parent8c7788f34e11f4c52d6a8a1340a8bd61476acabb (diff)
parent032ca4a76fc3cc81801903aa2532f1e6bae94ca2 (diff)
parent8180bd56bdd1dcade8d1b2a0b6f70b2397bec372 (diff)
Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ak4104', 'asoc/topic/arizona', 'asoc/topic/atmel' and 'asoc/topic/codec-component' into asoc-next