summaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2014-09-26 11:14:30 +0400
committerLee Jones <lee.jones@linaro.org>2014-09-26 11:14:30 +0400
commit0608bab8c7ceabd363901376d3693e8f45371768 (patch)
tree89e4ab336a0487ead7670314cf2b0621cc108daa /drivers/mfd
parentbd597f47ca4bf7a522a0298a95c7f9b2f0a75b9e (diff)
parent964356938fcd3c0001a786f55b9f0a0fbe47656a (diff)
parentd6cc1f5824cbca392d099f3bb0c441efd9e54de9 (diff)
downloadlinux-0608bab8c7ceabd363901376d3693e8f45371768.tar.xz
Merge branches 'ib-mfd-arm-3.18', 'ib-mfd-hwmon-leds-watchdog-3.18' and 'ib-mfd-power-charger-regulator-3.18' into ibs-for-mfd-merged