diff options
author | Mark Brown <broonie@linaro.org> | 2014-04-08 21:22:14 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-04-08 21:22:14 +0100 |
commit | ab5d6fbdb71c183add7431243c7f615c42b643bb (patch) | |
tree | 3510b5a1e246eb18408bd09a8701c7f56fec4ab5 /sound | |
parent | bfef92bb97b48d0ab5a543e2e7de09b6b014603e (diff) | |
parent | 03a620d8fa5f5423b87aa93e49bfa79b731c5790 (diff) | |
parent | 71e5222cbea124d737e1fe7de8e255253c12cd29 (diff) | |
parent | 3534b842a83549eb4d06613c616844c8762e9fd0 (diff) | |
parent | f78b1e0a8b85ed80b38e9b603b675dd7a0923128 (diff) | |
download | linux-next-ab5d6fbdb71c183add7431243c7f615c42b643bb.tar.gz |
Merge remote-tracking branches 'asoc/fix/rt5640', 'asoc/fix/samsung', 'asoc/fix/tlv320aic23' and 'asoc/fix/warn' into asoc-linus