diff options
author | Mark Brown <broonie@kernel.org> | 2014-10-06 12:49:07 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-10-06 12:49:07 +0100 |
commit | 978d4ddb9ed2fe272d66219e109afe6e8eb090a9 (patch) | |
tree | 70e1b6b1b8a11127411ebd20811565d1d9eb810f | |
parent | 248519c00eb239adc9a4a33e9970ccfea335b83a (diff) | |
parent | 83a7fc98dc9c29c5d2d66c80fb50725303a78192 (diff) | |
parent | be1aa3ea1f4179cbc84c57d3b1128c49515910ac (diff) | |
parent | 9766a1cfe5ef2042d1e604e2223629dc43307a21 (diff) | |
parent | 9cfb76905da525579d0d43c1205c86033d0ae3e5 (diff) | |
parent | 31d9f8faf9a54c851e835af489c82f45105a442f (diff) | |
download | blackbird-op-linux-978d4ddb9ed2fe272d66219e109afe6e8eb090a9.tar.gz blackbird-op-linux-978d4ddb9ed2fe272d66219e109afe6e8eb090a9.zip |
Merge remote-tracking branches 'asoc/topic/suspend', 'asoc/topic/tas2552', 'asoc/topic/tegra', 'asoc/topic/tlv320aic31xx' and 'asoc/topic/tlv320aic3x' into asoc-next