diff options
| author | Mark Brown <broonie@kernel.org> | 2016-07-24 22:07:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-07-24 22:07:35 +0100 |
| commit | abc026fac2068021ddb227d939ca136941fd9f93 (patch) | |
| tree | 9d2b9c475ecfd6f5071a4a5e29803896960566ce /include/sound | |
| parent | dd0111dcd6f46c8245ba98377e5d3473ae0689e0 (diff) | |
| parent | d93c5066e85e936765af29bf47ec78885d55ad02 (diff) | |
| parent | efc9194bcff84666832c6493bafa92029ac6634c (diff) | |
| parent | 181ad2a59d6e50417df58801f6e700dae5e3f8e8 (diff) | |
| parent | 716540fdd3d2461a00005cc1d9de067a27535ce2 (diff) | |
Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/hdmi', 'asoc/topic/maintainers' and 'asoc/topic/max8960' into asoc-next