summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-pcm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-05-22 00:23:54 +0100
committerMark Brown <broonie@linaro.org>2014-05-22 00:23:54 +0100
commit6630f30ed5e4d7f9fae9c7d63364225790765aef (patch)
treec656f1cb6d1a6049d12ec9407b59fc1935e2302c /sound/soc/soc-pcm.c
parent3a6a489fd86910ca09bf29f268bdede2516b2aba (diff)
parentee5e4534f7b39aaf1256d3de14f412489d5879df (diff)
parent2fa190ce33bdf2f58bb0a65d94e08980d92c76ed (diff)
parent0aa2a15a7b5ca861b02379a7dcb2d7bf427c62cc (diff)
parenta735d992c2e71e230b798518b7fe954fdbc2dc8c (diff)
parentc4839c87f508bdb2e5d735a064124dd6289a2853 (diff)
parent780aaeff96819ca58e0cad830bfbe6eee9aef82c (diff)
parent7b4a469e583f7f0e3259f4e0fc0baa844bc72782 (diff)
downloadlinux-6630f30ed5e4d7f9fae9c7d63364225790765aef.tar.bz2
Merge remote-tracking branches 'asoc/topic/headers', 'asoc/topic/intel', 'asoc/topic/jz4740', 'asoc/topic/max98090', 'asoc/topic/max98095', 'asoc/topic/mc13783' and 'asoc/topic/multicodec' into asoc-next