diff options
author | Mark Brown <broonie@kernel.org> | 2015-02-09 15:10:32 +0800 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-09 15:10:32 +0800 |
commit | 1525da06ff86ef80675c813016fe7e8fa2d10174 (patch) | |
tree | 66fc2eb23b0735cd6f955f20971ceb99b7aae778 /sound | |
parent | 1bf9f29a05ed027dfc3527966321bda33a77ebc3 (diff) | |
parent | 39552d7ad1409d07ef278a97adbfbee02a272d25 (diff) | |
parent | e7a0332f716d92b9a80c46fbd7d624c502984ca7 (diff) | |
parent | 691384503426f97f647e98eed85410eae71c2754 (diff) |
Merge remote-tracking branches 'asoc/topic/ts3a227e', 'asoc/topic/ts3a277e' and 'asoc/topic/txx9' into asoc-next