summaryrefslogtreecommitdiff
path: root/sound/soc/soc-topology.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-11-25 17:57:54 +0000
committerMark Brown <broonie@kernel.org>2015-11-25 17:57:54 +0000
commit923f1cbf2e45f6292a01de959031a8efeabede78 (patch)
treee53046332b38fe1c906ff153f25322da9c07057b /sound/soc/soc-topology.c
parent642eb0664157aa5cffb1bb3d0161d8d645946403 (diff)
parentc22d7666c5c4473cfffe8c40fcf86bd6e16317df (diff)
parent36a65e2072625556191c6c616d65ed4f67f4f0d0 (diff)
parent474d147ad1ecc98e50a65c9f350fadfcc37a8bb4 (diff)
parentf4be978b9611c94f20cdc8cee540ef1a52f8875c (diff)
parent41a59cae585678136c28cdcbba9cb2faf27685f5 (diff)
parente9f96bc53c1b959859599cb30ce6fd4fbb4448c2 (diff)
Merge remote-tracking branches 'asoc/fix/rt5677', 'asoc/fix/st', 'asoc/fix/sun4i-codec', 'asoc/fix/topology', 'asoc/fix/wm8960' and 'asoc/fix/wm8962' into asoc-linus