diff options
| author | Mark Brown | 2017-04-30 22:16:01 +0900 |
|---|---|---|
| committer | Mark Brown | 2017-04-30 22:16:01 +0900 |
| commit | 50946b2aecf747e68a50eefa78f1ff9e009a6c0a (patch) | |
| tree | 3de18557378711bd15ad855c48b9aa36860dc676 | |
| parent | 0f57c12ab467494f66c9d616358703ae8a5098d6 (diff) | |
| parent | 23aaf4ced39de2353e2204c8397418ebb771143a (diff) | |
| parent | e6d56d21bdcfd8968c1859bc1892608acad3e6d8 (diff) | |
| parent | 8f7206d69ab8c8fb8620566338d54c4b9b80477a (diff) | |
Merge remote-tracking branches 'asoc/topic/fsl-ssi', 'asoc/topic/hi6220' and 'asoc/topic/imx' into asoc-next