aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/iio
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-01-12 12:29:11 +0000
committerMark Brown <broonie@kernel.org>2018-01-12 12:29:11 +0000
commitbad80485c386bc64222941b715f10705a1bd5ba9 (patch)
treeac61a3db39ba08ddfe90de73c285e7dc209df794 /include/linux/iio
parentMerge remote-tracking branches 'asoc/topic/eukrea-tlv320', 'asoc/topic/fsl', 'asoc/topic/fsl-ssi' and 'asoc/topic/fsl_asrc' into asoc-next (diff)
parentASoC: hdac_hdmi: Add vendor id for Cannonlake HDMI codec (diff)
parentASoC: hisilicon: remove duplicate includes (diff)
parentIIO: ADC: fix return value check in stm32_dfsdm_adc_probe() (diff)
parentASoC: max98373: Modified control names for TLV controls (diff)
downloadlinux-dev-bad80485c386bc64222941b715f10705a1bd5ba9.tar.xz
linux-dev-bad80485c386bc64222941b715f10705a1bd5ba9.zip
Merge remote-tracking branches 'asoc/topic/hdac_hdmi', 'asoc/topic/hisilicon', 'asoc/topic/iio' and 'asoc/topic/max98373' into asoc-next