aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'for-v3.5' of git://git.infradead.org/battery-2.6Linus Torvalds2012-05-3111-485/+839
|\
| * smb347-charger: Include missing <linux/err.h>Mika Westerberg2012-05-181-0/+1
| * smb347-charger: Clean up battery attributesRamakrishna Pallala2012-05-061-49/+0
| * max17042_battery: Add support for max17047/50 chipRamakrishna Pallala2012-05-052-13/+61
| * sbs-battery.c: Capacity attr = remaining relative capacityNikolaus Voss2012-05-051-1/+1
| * isp1704_charger: Use after free on probe errorDan Carpenter2012-05-051-1/+1
| * ds2781_battery: Use DS2781_PARAM_EEPROM_SIZE and DS2781_USER_EEPROM_SIZEAxel Lin2012-05-051-14/+6
| * power_supply: Fix a typo in BATTERY_DS2781 Kconfig entryAxel Lin2012-05-051-1/+1
| * charger-manager: Provide cm_notify_event function for in-kernel useChanwoo Choi2012-05-051-0/+163
| * charger-manager: Poll battery health in normal stateChanwoo Choi2012-05-051-0/+229
| * smb347-charger: Convert to regmap APIMika Westerberg2012-05-052-327/+232
| * smb347-charger: Move IRQ enabling to the end of probeMika Westerberg2012-05-051-4/+2
| * smb347-charger: Rename few functions to match better what they are doingMika Westerberg2012-05-051-21/+21
| * smb347-charger: Convert to use module_i2c_driver()Mika Westerberg2012-05-051-11/+1
| * smb347_charger: Cleanup power supply registration code in probeRamakrishna Pallala2012-05-051-30/+40
| * ab8500: Clean up probe routinesLee Jones2012-05-053-18/+30
| * ab8500_fg: Harden platform data checkLinus Walleij2012-05-051-2/+2
| * ab8500_btemp: Harden platform data checkLinus Walleij2012-05-051-2/+2
| * ab8500_charger: Harden platform data checkLinus Walleij2012-05-051-3/+2
| * max17042_battery: Handle irq request failure caseRamakrishna Pallala2012-05-051-1/+3
| * max17042_battery: Fix power supply and irq registration orderingRamakrishna Pallala2012-05-041-5/+7
| * power_supply: Make the core a boolean instead of a tristateAnton Vorontsov2012-05-041-1/+1
| * power_supply: Add voltage_ocv property and use it for max17042 driverRamakrishna Pallala2012-05-042-0/+9
| * max17042_battery: Move dev_pm_ops struct under CONFIG_PMAnton Vorontsov2012-05-041-9/+11
| * max17042_battery: Add suspend/resume hooksRamakrishna Pallala2012-05-041-0/+41
| * max17042_battery: Fix driver exit functionRamakrishna Pallala2012-05-041-0/+2
| * max17042_battery: Fix a couple buffer overflowsDan Carpenter2012-05-041-6/+4
* | Merge tag 'mfd-3.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/...Linus Torvalds2012-05-291-8/+13
|\ \
| * | mfd: Convert wm831x to irq_domainMark Brown2012-05-201-8/+13
| |/
* | Merge branch 'master' into for-nextJiri Kosina2012-04-0825-271/+11345
|\ \ | |/
| * Merge tag 'for-v3.4-rc1' of git://git.infradead.org/battery-2.6Linus Torvalds2012-03-3016-195/+10368
| |\
| | * max17042_battery: Clean up interrupt handlingRamakrishna Pallala2012-03-261-11/+7
| | * Revert "max8998_charger: Include linux/module.h just once"Anton Vorontsov2012-03-261-0/+1
| | * ab8500_fg: Fix some build warnings on x86_64Anton Vorontsov2012-03-261-2/+2
| | * max17042_battery: Fix CHARGE_FULL representation.MyungJoo Ham2012-03-261-5/+2
| | * max8998_charger: Include linux/module.h just onceJesper Juhl2012-03-261-1/+0
| | * power_supply: Convert i2c drivers to module_i2c_driverAxel Lin2012-03-266-74/+6
| | * lp8727_charger: Add MODULE_DEVICE_TABLEAxel Lin2012-03-261-0/+1
| | * charger-manager: Simplify charger_get_property(), get rid of a warningAnton Vorontsov2012-03-261-3/+3
| | * charger-manager: Clean up for better readabilityAxel Lin2012-03-261-35/+26
| | * da9052-battery: Convert to use module_platform_driverAxel Lin2012-03-261-12/+1
| | * da9052-battery: Fix a memory leak when unload the moduleAxel Lin2012-03-261-0/+1
| | * da9052-battery: Add missing platform_set_drvdataAxel Lin2012-03-261-0/+1
| | * ab8500: Turn unneeded global symbols into local onesAnton Vorontsov2012-03-263-3/+3
| | * ab8500_fg: Fix copy-paste errorAnton Vorontsov2012-03-261-1/+1
| | * ab8500_fg: Get rid of 'struct battery_type'Anton Vorontsov2012-03-261-1/+2
| | * ab8500_fg: Get rid of 'struct v_to_cap'Anton Vorontsov2012-03-261-1/+1
| | * ab8500_btemp: Get rid of 'enum adc_therm'Anton Vorontsov2012-03-261-6/+7
| | * ab8500_charger: Convert to the new USB OTG callsAnton Vorontsov2012-03-261-12/+12
| | * ab8500-btemp: AB8500 battery temperature driverArun Murthy2012-03-263-0/+1136