diff options
author | Mark Brown <broonie@linaro.org> | 2014-05-22 00:24:04 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-05-22 00:24:04 +0100 |
commit | cee429e5c53f7ffc1dd500001d9dff567833c23d (patch) | |
tree | 729866f9dffafea9d36c71e0f8747627d4d6dcd0 /sound/soc/codecs/tlv320aic3x.c | |
parent | 04f87446c2cf2cadb17eaad6c789d75177179743 (diff) | |
parent | 55bc82536960e4749df7ae5666a93702190c53d4 (diff) | |
parent | 3598aad5470deb5eb4f643ef89abb9b172803e76 (diff) | |
parent | a3086791ebe0c50aff0753a24db565ae0da7be18 (diff) | |
parent | e90c7b456b58a8cd94c8b4be2740133d163c1cba (diff) | |
parent | a0b148b4232472f5c046ace203b7856f51564d70 (diff) | |
download | op-kernel-dev-cee429e5c53f7ffc1dd500001d9dff567833c23d.zip op-kernel-dev-cee429e5c53f7ffc1dd500001d9dff567833c23d.tar.gz |
Merge remote-tracking branches 'asoc/topic/ux500', 'asoc/topic/wm8731', 'asoc/topic/wm8804', 'asoc/topic/wm8955' and 'asoc/topic/wm8985' into asoc-next