summaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-09-01 13:12:52 +0200
committerMark Brown <broonie@kernel.org>2017-09-01 13:12:52 +0200
commitbf3cc310a23defb31e23c3f062b335178c8a603f (patch)
tree2220069634ec0289e300754bf630235120e1642b /kernel/trace
parentMerge remote-tracking branches 'asoc/topic/mtk', 'asoc/topic/mxs', 'asoc/topi... (diff)
parentASoC: omap: make snd_soc_platform_driver const (diff)
parentASoC: psc-ac97: constify dev_pm_ops structure (diff)
parentASoC: pxa: constify snd_pcm_ops structures (diff)
downloadlinux-bf3cc310a23defb31e23c3f062b335178c8a603f.tar.xz
linux-bf3cc310a23defb31e23c3f062b335178c8a603f.zip
Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/psc-ac97' and 'asoc/topic/pxa' into asoc-next