diff options
| author | Mark Brown <broonie@kernel.org> | 2017-09-01 12:12:52 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-09-01 12:12:52 +0100 |
| commit | bf3cc310a23defb31e23c3f062b335178c8a603f (patch) | |
| tree | 2220069634ec0289e300754bf630235120e1642b /sound/core/pcm_misc.c | |
| parent | af4f47717ff17cf81710cbd5dd78f11705204b88 (diff) | |
| parent | 27bfda02662152f5e0d17731063cfcb342904b58 (diff) | |
| parent | da61a11823395c87db0471d8d54055fa5a961688 (diff) | |
| parent | d7622fa715f20dbc7c1ab0dbdd714be5a2b4c3bd (diff) | |
| download | linux-bf3cc310a23defb31e23c3f062b335178c8a603f.tar.bz2 | |
Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/psc-ac97' and 'asoc/topic/pxa' into asoc-next