summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-30 15:56:44 +0100
committerMark Brown <broonie@kernel.org>2015-08-30 15:56:44 +0100
commitcfed47d7b5abd5ce9c010169cce9c2754394a02d (patch)
tree9ca797fad8fbfecae2130ea05713dee0f002084b /sound
parenta8f1d97bfa986f00835d2669a970e19f6dd9b9d8 (diff)
parent7d4d443eb4386d6dbd420fa96303dd8fbc1eefc8 (diff)
parente8de871e19668257972b167aabd56bb5faae784c (diff)
parente22579713ae1384a3dff545369cebe42b01370fa (diff)
parent8e2175d42e435b7957bfaa921fc27cb40e923372 (diff)
parent2c3f4b97eea5ce405baf2591715445da6ed05851 (diff)
Merge remote-tracking branches 'asoc/topic/rt5677', 'asoc/topic/sh', 'asoc/topic/simple', 'asoc/topic/sirf-codec' and 'asoc/topic/spear' into asoc-next