aboutsummaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-09-23 11:01:22 -0700
committerMark Brown <broonie@kernel.org>2015-09-23 11:01:22 -0700
commit9abbe73e7d49ff7939c9a45bf50647cf47b05abf (patch)
tree4940bde9fbc2a0a91f7e82533d47b07dbd4f7946 /include/sound
parentf7b93159abf368565ff6bd222bbd2412f4a22c5c (diff)
parent27fcf913f6462662e9ec1b74ce04961126852db9 (diff)
parent30953a804714fcfe49bec594239306bf5b476464 (diff)
parent887e83e32d99e43798e9ac9a274ad4debebf03f7 (diff)
parentcde79035c6cf578dd33dfea3e39666efc27cbcf2 (diff)
parent5b73de19fd65f11a8c1b33bb7aeb0275898f8786 (diff)
Merge remote-tracking branches 'asoc/topic/jz4740', 'asoc/topic/kirkwood', 'asoc/topic/mtk', 'asoc/topic/multi' and 'asoc/topic/mxs' into asoc-next