diff options
| author | Mark Brown <broonie@kernel.org> | 2016-03-13 15:17:28 +0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-13 15:17:28 +0700 |
| commit | f2d4c127f75b32aaf2b3c18f6010bbd4086df0b0 (patch) | |
| tree | dca890865184939882b50c4c85e12e6b0afe5374 /sound/oss/pas2_midi.c | |
| parent | 88f183484a9419910737cde211f7dbb184171d66 (diff) | |
| parent | aa3e838869d494c437c693b54d12fe02b96a0aa1 (diff) | |
| parent | 568cecf42f35bf40bdf94107fb638997f82827f7 (diff) | |
Merge remote-tracking branches 'asoc/topic/pxa' and 'asoc/topic/qcom' into asoc-next