diff options
| author | Mark Brown <broonie@kernel.org> | 2015-12-23 00:23:51 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-12-23 00:23:51 +0000 |
| commit | 14418aa7d4395651645c5f36bfe42324e27e0360 (patch) | |
| tree | 562a43f9c812fc452e3ca485b242da19a746a8ea /sound/soc/sti | |
| parent | d1587e345c4f93e0df805fc3e276ce4d3db97e21 (diff) | |
| parent | 9bdca822cbd6b66124f2298504b6c4526599dc8f (diff) | |
| parent | e6e969f1fd332e7525c577c0d8cfcbe898409abd (diff) | |
| parent | bfbcab7c2d8ab4cb52f0785d7381d20f39bb065b (diff) | |
| parent | 0d3f3c9a48d758454b0f57ca3eccd9ea3f6a4724 (diff) | |
Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sh', 'asoc/topic/ssm2518' and 'asoc/topic/sti' into asoc-next