summaryrefslogtreecommitdiff
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-07-24 22:07:33 +0100
committerMark Brown <broonie@kernel.org>2016-07-24 22:07:33 +0100
commitdd0111dcd6f46c8245ba98377e5d3473ae0689e0 (patch)
treebc79f50f5937753a00ab7fdfbd7f58318e4bd9ce /sound/soc/soc-dapm.c
parent3ceeda1cbee9f93bb5537c9b840d1f7e767d7c01 (diff)
parent09464974eaa8325c4cd22c3cab743a110644fb31 (diff)
parentadd3873ebdf375e0366044fa0c0078e402eef744 (diff)
parent57072ae122178416f84304fa54c4d0204c6cec1a (diff)
parent121a01521b1ef7440ea285aa3aae02bf005e5635 (diff)
Merge remote-tracking branches 'asoc/topic/dpcm', 'asoc/topic/dt', 'asoc/topic/dwc' and 'asoc/topic/fsl' into asoc-next