summaryrefslogtreecommitdiffstats
path: root/drivers/iio
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2019-02-01 08:20:04 +0000
committerLee Jones <lee.jones@linaro.org>2019-02-01 08:20:04 +0000
commitfa56a62d01496252aabfeca0a5903864690951ac (patch)
tree3fef20246e2d925e26f74f1c208226b7da4f9924 /drivers/iio
parent81cdab79818988d27d8aeb162b7988c9e6dde936 (diff)
parent28804c2c8fb3401aa4b7f16a883d49dd82f5e377 (diff)
parentfd68bd0f5d4c2090c95f84e27b05d0836bcd6c0c (diff)
downloadlinux-fa56a62d01496252aabfeca0a5903864690951ac.tar.bz2
Merge branches 'ib-mfd-iio-input-5.1', 'ib-mfd-input-watchdog-5.1' and 'ib-mfd-platform-5.1' into ibs-for-mfd-merged