diff options
| author | Mark Brown <broonie@kernel.org> | 2016-03-13 15:17:18 +0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-13 15:17:18 +0700 |
| commit | 88f183484a9419910737cde211f7dbb184171d66 (patch) | |
| tree | 7c194d49b31b59ec3e8ba59ba2a7c98e2442742a /sound/oss/pas2_midi.c | |
| parent | ab96d9d60367d614818692cfb8903f2afcfef214 (diff) | |
| parent | e354d86e551656668e879c833de9890b5053cc88 (diff) | |
| parent | 05f5afd3f0d915537b67d3cfcb464e6836a65caf (diff) | |
| parent | 436e056c4ba368f13a5709a5a4a7f26fc238a5a6 (diff) | |
| parent | 45d5eb3a342f2ef3d6dae16b074fdd9a01992fb5 (diff) | |
| parent | e04fadaa169b09609fb55779236d35fb3197c932 (diff) | |
Merge remote-tracking branches 'asoc/topic/max98926', 'asoc/topic/mtk', 'asoc/topic/mxs-saif', 'asoc/topic/nau8825' and 'asoc/topic/omap' into asoc-next