summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-12-23 00:23:49 +0000
committerMark Brown <broonie@kernel.org>2015-12-23 00:23:49 +0000
commitd1587e345c4f93e0df805fc3e276ce4d3db97e21 (patch)
treef81d21af66c80aac241c9cc8fcaf861582d9f659 /include/sound
parent81b6863cae0ca371ebe8bd176548be4d2741e6bb (diff)
parent166765ea8b686c64b590fa62664a4adb35aa2d6a (diff)
parente2133b64820df302a8e3d00c7531018470cd63a9 (diff)
parent1aa844cd56c7a2b94824f02495ff7ae5d52a7e91 (diff)
Merge remote-tracking branches 'asoc/topic/rt286', 'asoc/topic/rt5616' and 'asoc/topic/rt5677' into asoc-next