diff options
author | Mark Brown <broonie@kernel.org> | 2016-05-13 14:26:15 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-05-13 14:26:15 +0100 |
commit | 86d811d898cdd823d3ee35f6441c72216ae89e1e (patch) | |
tree | 72829de5107f529e5c9f1e81dc3c491fd2dd914a /include/sound | |
parent | 44549e8f5eea4e0a41b487b63e616cb089922b99 (diff) | |
parent | 823ecdd684e28d4e71686fc8787b6d31b1223382 (diff) | |
parent | 3cc6185bcccff32df41faa97d592a99d258db185 (diff) | |
parent | 7e885d211f023dfd201fad8246bbf3c3bd126c61 (diff) | |
parent | b9c17f13ba484d8492278c67cd95b7207def776f (diff) | |
download | linux-86d811d898cdd823d3ee35f6441c72216ae89e1e.tar.gz linux-86d811d898cdd823d3ee35f6441c72216ae89e1e.tar.bz2 linux-86d811d898cdd823d3ee35f6441c72216ae89e1e.zip |
Merge remote-tracking branches 'asoc/fix/davinci', 'asoc/fix/fsl-ssi', 'asoc/fix/rockchip' and 'asoc/fix/rt286' into asoc-linus