diff options
author | Mark Brown <broonie@kernel.org> | 2015-08-30 17:56:44 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-08-30 17:56:44 +0300 |
commit | cfed47d7b5abd5ce9c010169cce9c2754394a02d (patch) | |
tree | 9ca797fad8fbfecae2130ea05713dee0f002084b /sound/soc/Makefile | |
parent | a8f1d97bfa986f00835d2669a970e19f6dd9b9d8 (diff) | |
parent | 7d4d443eb4386d6dbd420fa96303dd8fbc1eefc8 (diff) | |
parent | e8de871e19668257972b167aabd56bb5faae784c (diff) | |
parent | e22579713ae1384a3dff545369cebe42b01370fa (diff) | |
parent | 8e2175d42e435b7957bfaa921fc27cb40e923372 (diff) | |
parent | 2c3f4b97eea5ce405baf2591715445da6ed05851 (diff) | |
download | linux-cfed47d7b5abd5ce9c010169cce9c2754394a02d.tar.xz |
Merge remote-tracking branches 'asoc/topic/rt5677', 'asoc/topic/sh', 'asoc/topic/simple', 'asoc/topic/sirf-codec' and 'asoc/topic/spear' into asoc-next