diff options
author | Mark Brown <broonie@kernel.org> | 2017-09-01 13:12:52 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-09-01 13:12:52 +0200 |
commit | bf3cc310a23defb31e23c3f062b335178c8a603f (patch) | |
tree | 2220069634ec0289e300754bf630235120e1642b /kernel/trace | |
parent | Merge remote-tracking branches 'asoc/topic/mtk', 'asoc/topic/mxs', 'asoc/topi... (diff) | |
parent | ASoC: omap: make snd_soc_platform_driver const (diff) | |
parent | ASoC: psc-ac97: constify dev_pm_ops structure (diff) | |
parent | ASoC: pxa: constify snd_pcm_ops structures (diff) | |
download | linux-bf3cc310a23defb31e23c3f062b335178c8a603f.tar.xz linux-bf3cc310a23defb31e23c3f062b335178c8a603f.zip |
Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/psc-ac97' and 'asoc/topic/pxa' into asoc-next