diff options
author | Mark Brown <broonie@kernel.org> | 2015-06-22 10:24:33 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-06-22 10:24:33 +0100 |
commit | 71d8c2d78351a3c2fe6b432f1d5efd78327c97d8 (patch) | |
tree | a02631acf86e8ce4aba91b86b3cdbe23fe474949 /sound/soc/sh | |
parent | 861fe717256e7fe2d091d4676a611e6ea2496b15 (diff) | |
parent | bdb052e81f6236b4febb50ed74f79f770fa82cc5 (diff) | |
parent | 8a4e379b54f8cf1180cfee8ad3bfe16beedac65b (diff) | |
parent | bc08f96b5fa783132c278d7a48a1c18feca5813f (diff) | |
parent | b895dc2c47c3e81c9de452d84ad4f4fc6f862de1 (diff) |
Merge remote-tracking branches 'asoc/topic/qcom', 'asoc/topic/rcar', 'asoc/topic/rt286' and 'asoc/topic/rt5640' into asoc-next