diff options
| author | Mark Brown <broonie@kernel.org> | 2016-03-13 15:17:01 +0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-13 15:17:01 +0700 |
| commit | 6fee37df0212f61b9abcc7805d7879fa2c9096d9 (patch) | |
| tree | 1cf18296f8098d469557e7cd29b0f6eb4595fc82 | |
| parent | a391dbe09ac41adc5351a985f501a5866d73f220 (diff) | |
| parent | dc6cdb420359103e1f20752d01cb1e2bbe8ba8b8 (diff) | |
| parent | 57e756d30268a0373cce97165bd57331554f4bfd (diff) | |
| parent | 0d55ad456337487e8cdb72acdd520050e575a0bd (diff) | |
Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/fsl-card' and 'asoc/topic/fsl-mpc5200' into asoc-next