diff options
| author | Mark Brown <broonie@kernel.org> | 2015-06-05 18:54:52 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-05 18:54:52 +0100 |
| commit | 698803f8b9cec4e224bc344f7120f70246457ae0 (patch) | |
| tree | 5c6a7df6f9fc468711edfafc8db5d9563a786371 | |
| parent | 6ba82f91df1f3b57a2339581f5065d178be7e413 (diff) | |
| parent | 518f6bab13842a5f25bd8f89b1cae32aa8adf91f (diff) | |
| parent | b073ed4e21268da59c40a4fc5d56e3af808ecc4d (diff) | |
Merge remote-tracking branches 'asoc/topic/davinci' and 'asoc/topic/dpcm' into asoc-next