summaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2018-10-23 08:58:01 +0100
committerLee Jones <lee.jones@linaro.org>2018-10-23 08:58:01 +0100
commit92af5c130c207b2b0d07e2a223a4901f16be1536 (patch)
tree69d930dbc4097c37b50893a4ede6f094b9eead88 /drivers/mfd
parent7a39915b723ae46e78c5189dfb3fc889df976a8d (diff)
parentd31ca7e5d0fa066d59540859af32ab6f95adb519 (diff)
parent9612f8f503804d2fd2f63aa6ba1e58bba4612d96 (diff)
parent65b80dfffeabd4eb253b93d07eadde4d89c18511 (diff)
Merge branches 'ib-mfd-iio-input-4.20', 'ib-mfd-irqchip-4.20', 'ib-mfd-rtc-4.20' and 'ib-mfd-spi-tty-4.20-1' into ibs-for-mfd-merged