diff options
| author | Mark Brown <broonie@kernel.org> | 2015-06-05 18:54:53 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-05 18:54:53 +0100 |
| commit | eb2d8ec37fadb272dae7f1e6c93abf03fec8e3e3 (patch) | |
| tree | aa48d00eb4e83b5ebb57a31377301a2dc210206e | |
| parent | 698803f8b9cec4e224bc344f7120f70246457ae0 (diff) | |
| parent | 0f9a7fecf2514cd5cb14be8e9aae3556c403ff1f (diff) | |
| parent | c5f4823babfd5e1b34494310e0a9f7cab44cadb9 (diff) | |
| parent | f490f326178a6fec87a9bc3d35525bc9cb96ef0e (diff) | |
| parent | ff9174d57a8239c5a21d2a0c7e00dddd54953f6c (diff) | |
| parent | e616d2eba6d1ac8f3268cdf5d7b0424072c89a8d (diff) | |
Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/fsl-sai', 'asoc/topic/fsl-spdif', 'asoc/topic/fsl-ssi' and 'asoc/topic/gpio-jack' into asoc-next