aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2015-06-22 12:24:25 +0100
committerLee Jones <lee.jones@linaro.org>2015-06-22 12:24:25 +0100
commit79aa79342c70c47a6e55f4865e8154f155109946 (patch)
tree7dc36abea21ce7fa5755184c12be274d6efdb382 /include/linux
parentMAINTAINERS: Add Watchdog and RTC files to STI's maintainer entry (diff)
parentmfd: axp20x: Enable AXP22X regulators (diff)
parentmfd: cros_ec: Staticise some newly introduced structures (diff)
Merge branches 'ib-mfd-watchdog-rtc-4.2', 'ib-mfd-regulator-4.2' and 'ib-mfd-i2c-input-chrome-4.2' into ibs-for-mfd-merged