diff options
author | Mark Brown <broonie@linaro.org> | 2014-07-18 00:45:47 +0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-07-18 00:45:47 +0400 |
commit | d0ab92d63cd6df4c47d93940bd5e4e7737fa4909 (patch) | |
tree | b03d2027d23f488443e284caf6adf1d07045c248 /sound | |
parent | a3e048a5bbe98acb8830745f172b2af051410fb8 (diff) | |
parent | b97c60abf9a561f86ae71bd741add02673cc1a08 (diff) | |
parent | e42be7e1420389349400e990a3b13d23b9c60d39 (diff) | |
parent | c7099eb1c19e60251e6725d6302354dfabae5303 (diff) | |
parent | 25ccb22ed55cf4ed1b94e2627b80f9ef44637558 (diff) | |
download | linux-d0ab92d63cd6df4c47d93940bd5e4e7737fa4909.tar.xz |
Merge remote-tracking branches 'asoc/fix/samsung', 'asoc/fix/sgtl5000', 'asoc/fix/simple' and 'asoc/fix/tlv320aic3x' into asoc-linus