diff options
| author | Mark Brown <broonie@kernel.org> | 2016-01-11 13:54:32 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-01-11 13:54:32 +0000 |
| commit | 188bdf726877fb27530934baea90876dfc2012ba (patch) | |
| tree | 582a51593c3cfcfd0382bb2b654abd08c90ebb3e /sound/soc/Makefile | |
| parent | 551e13a4b94301e8a65e29b652935b81d8d32861 (diff) | |
| parent | 83a40ce993cda0757b102389e38446e79a2cc172 (diff) | |
| parent | 7cb1dc810935fbf82ad06007dc7fb08d93c1e59f (diff) | |
| download | linux-188bdf726877fb27530934baea90876dfc2012ba.tar.gz linux-188bdf726877fb27530934baea90876dfc2012ba.tar.bz2 linux-188bdf726877fb27530934baea90876dfc2012ba.zip | |
Merge remote-tracking branches 'asoc/topic/adsp' and 'asoc/topic/amd' into asoc-next