summaryrefslogtreecommitdiff
path: root/drivers/mfd/Makefile
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2018-01-08 11:02:37 +0000
committerLee Jones <lee.jones@linaro.org>2018-01-08 11:02:37 +0000
commit8848ff42062dde7e641b8373d856419efa8c5484 (patch)
treee36b6f199d237943bccfface7c54827b5f8ade20 /drivers/mfd/Makefile
parent4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 (diff)
parent9bf317e900a19a857eb9921c9441a92e89f40415 (diff)
parent8f52df50d9366f770a894d14ef724e5e04574e98 (diff)
parent51bd7125f740a1bc9e79cd117d7d50f1dc67a446 (diff)
parent5e0115581bbc367c7958bf5ab8c511b808558533 (diff)
parenta8b751eb709ecefe0a81a0112d9c01b2181a3efa (diff)
Merge branches 'ib-mfd-leds-4.16', 'ib-mfd-memstick-misc-mmc-4.16', 'ib-mfd-platform-4.16' and 'ib-mfd-tty-watchdog-4.16', tag 'ib-extcon-mfd-4.16-1' into ibs-for-mfd-merged
Immutable branch for both MFD and EXTCON tree.