diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-06 12:48:50 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-06 12:48:50 +0100 |
| commit | 832a94143c549bc750350c4e770f1f604e6aaffb (patch) | |
| tree | 72904df357465a61714b0cc7391dac8b2997d586 | |
| parent | fd7aff54ff6862cde82db8a7d55166a2f0a34b9c (diff) | |
| parent | 19926c6de0c37f486f00b7531aec4ba5a09451ae (diff) | |
| parent | f69e3caa9e1855737bf1e99e1fe4488e33d74bfe (diff) | |
Merge remote-tracking branches 'asoc/fix/davinci' and 'asoc/fix/max98090' into asoc-linus