summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/stmpe.c
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2019-02-01 09:20:04 +0100
committerLee Jones <lee.jones@linaro.org>2019-02-01 09:20:04 +0100
commitfa56a62d01496252aabfeca0a5903864690951ac (patch)
tree3fef20246e2d925e26f74f1c208226b7da4f9924 /drivers/mfd/stmpe.c
parentiio: adc: add STMPE ADC devicetree bindings (diff)
parentwatchdog: stpmic1: Add STPMIC1 watchdog driver (diff)
parentplatform/chrome: cros_ec_lightbar: Instantiate only if the EC has a lightbar (diff)
downloadlinux-fa56a62d01496252aabfeca0a5903864690951ac.tar.xz
linux-fa56a62d01496252aabfeca0a5903864690951ac.zip
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