diff options
author | Lee Jones <lee.jones@linaro.org> | 2014-09-26 09:14:30 +0200 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2014-09-26 09:14:30 +0200 |
commit | 0608bab8c7ceabd363901376d3693e8f45371768 (patch) | |
tree | 89e4ab336a0487ead7670314cf2b0621cc108daa /Documentation/devicetree | |
parent | devicetree: Dialog Semiconductor consolidate existing vendor prefixes to stan... (diff) | |
parent | hwmon: (menf21bmc) Introduce MEN14F021P00 BMC HWMON driver (diff) | |
parent | Documentation: charger: max14577: Document exported sysfs entry (diff) | |
download | linux-0608bab8c7ceabd363901376d3693e8f45371768.tar.xz linux-0608bab8c7ceabd363901376d3693e8f45371768.zip |
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