diff options
| author | Mark Brown <broonie@kernel.org> | 2016-07-24 22:07:40 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-07-24 22:07:40 +0100 |
| commit | f3413783e48f0a5b4cc7795cbf66f084eb739821 (patch) | |
| tree | da8abf564daf70d8d5488033215267346ada32bd | |
| parent | c704f4e31210b76a7236e90847f9e989383be926 (diff) | |
| parent | 65aca64d05b5eaa5ce15e18b458a8d338ddbd478 (diff) | |
| parent | 53ae918f117dbb86e7b872e3b7532839f752c895 (diff) | |
| parent | 46dd2e28a90e48fbf1b7e253933fa3b7242e9b1b (diff) | |
Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/rcar' and 'asoc/topic/rockchip' into asoc-next