summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-12-12 16:53:07 +0100
committerMark Brown <broonie@kernel.org>2016-12-12 16:53:07 +0100
commit2f028b15a232737ba8dd5b883adcca3471a8280e (patch)
treea09a2586ed435754bd8c6739e424f673784bdac3 /include
parentMerge remote-tracking branches 'asoc/topic/inntel', 'asoc/topic/input', 'asoc... (diff)
parentASoC: soc-core: adjust for graph on snd_soc_of_parse_audio_simple_widgets (diff)
parentASoC: pxa: Make static string arrays 'const 'char * const []' (diff)
parentASoC: msm8916-wcd-analog: Update correct register setting for MIC BIAS Internal1 (diff)
parentregulator: rk808: Use rdev_get_id() to access id of regulator (diff)
downloadlinux-2f028b15a232737ba8dd5b883adcca3471a8280e.tar.xz
linux-2f028b15a232737ba8dd5b883adcca3471a8280e.zip
Merge remote-tracking branches 'asoc/topic/of-graph', 'asoc/topic/pxa', 'asoc/topic/qcom' and 'asoc/topic/rk808' into asoc-next