aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-05-13 14:26:15 +0100
committerMark Brown <broonie@kernel.org>2016-05-13 14:26:15 +0100
commit86d811d898cdd823d3ee35f6441c72216ae89e1e (patch)
tree72829de5107f529e5c9f1e81dc3c491fd2dd914a /sound
parent44549e8f5eea4e0a41b487b63e616cb089922b99 (diff)
parent823ecdd684e28d4e71686fc8787b6d31b1223382 (diff)
parent3cc6185bcccff32df41faa97d592a99d258db185 (diff)
parent7e885d211f023dfd201fad8246bbf3c3bd126c61 (diff)
parentb9c17f13ba484d8492278c67cd95b7207def776f (diff)
downloadlinux-stericsson-86d811d898cdd823d3ee35f6441c72216ae89e1e.tar.gz
Merge remote-tracking branches 'asoc/fix/davinci', 'asoc/fix/fsl-ssi', 'asoc/fix/rockchip' and 'asoc/fix/rt286' into asoc-linus