summaryrefslogtreecommitdiff
path: root/sound/soc/soc-pcm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-01-16 12:42:51 +0000
committerMark Brown <broonie@linaro.org>2014-01-16 12:42:51 +0000
commitefe265d301c6157d6c8bcd2ef239fdf552191190 (patch)
treef37abbdec2aff0dacd9486c3405a8cae427f389b /sound/soc/soc-pcm.c
parentcdef2e5f358db5fd27eec4c72eb295c232287813 (diff)
parente20970ada3f699c113fe64b04492af083d11a7d8 (diff)
parente8e08c521dc101cf7e7e1caf4f487f9fe11a9a7a (diff)
Merge remote-tracking branches 'asoc/fix/adau1701' and 'asoc/fix/tlv320aic32x4' into for-tiwai