summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/Makefile
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2014-07-09 15:55:13 +0200
committerLee Jones <lee.jones@linaro.org>2014-07-09 15:55:13 +0200
commit6ec9dc323b0fd4b83e6da64acc871f74508c0077 (patch)
tree0f2ca300f22c35916d741ca397a3f25f3d26aeab /drivers/mfd/Makefile
parentmfd: max77693: Handle IRQs using regmap (diff)
parentgpio: crystalcove: Fix implicit declaration of function 'seq_printf' error (diff)
parentmmc: rtsx: add support for async request (diff)
downloadlinux-6ec9dc323b0fd4b83e6da64acc871f74508c0077.tar.xz
linux-6ec9dc323b0fd4b83e6da64acc871f74508c0077.zip
Merge branches 'ib-mfd-extcon-regulator-3.17', 'ib-mfd-gpio-3.17' and 'ib-mfd-mmc-3.17' into ibs-for-mfd-merged