diff options
author | Mark Brown <broonie@kernel.org> | 2017-05-26 12:42:39 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-05-26 12:42:39 +0100 |
commit | e293d148343f9a77cbf8953d6f9554ae467138ac (patch) | |
tree | b96aab9ac3025f396d6f6d20600aee9c20767b67 /sound | |
parent | af2415ebb1df2ca3b3d9373b2355c69ccb733a4e (diff) | |
parent | 6d3edf866ffa7a9348cfc30d9f58270e4f8d068e (diff) | |
parent | 03ba791df98d15d07ea74075122af71e35c7611c (diff) | |
parent | 3048e76c93bccf875a49025870de08aed86c4692 (diff) |
Merge remote-tracking branches 'asoc/topic/rt5514', 'asoc/topic/rt5614' and 'asoc/topic/sh' into asoc-next