aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-11-065-0/+5
|\
| * drivers/power: Add module.h to the actual modules in drivers/powerPaul Gortmaker2011-10-314-0/+4
| * drivers: power_supply_sysfs.c needs stat.hPaul Gortmaker2011-10-311-0/+1
* | Merge branch 'akpm' (Andrew's incoming - part two)Linus Torvalds2011-11-021-35/+51
|\ \
| * | drivers/power/ds2780_battery.c: fix deadlock upon insertion and removalClifton Barnes2011-11-021-0/+9
| * | drivers/power/ds2780_battery.c: create central point for calling w1 interfaceClifton Barnes2011-11-021-35/+42
| |/
* | um: switch to use of drivers/KconfigAl Viro2011-11-021-0/+1
|/
* s3c-adc-battery: Fix compilation error due to missing header (module.h)Vasily Khoruzhick2011-08-191-0/+1
* max8997_charger: Needs module.hAxel Lin2011-08-191-0/+1
* max8998_charger: Needs module.hRandy Dunlap2011-08-191-0/+1
* Merge git://git.infradead.org/battery-2.6Linus Torvalds2011-07-3113-102/+692
|\
| * gpio-charger: Fix checking return value of request_any_context_irqAxel Lin2011-07-081-1/+1
| * power_supply: MAX17042: Support additional propertiesDonggeun Kim2011-07-081-68/+105
| * max8903_charger: Allow platform data to be __initdataMyungJoo Ham2011-07-081-8/+8
| * power_supply: Add charger driver for MAX8998/LP3974Donggeun Kim2011-07-083-0/+226
| * power_supply: Add charger driver for MAX8997/8966Donggeun Kim2011-07-083-0/+214
| * max17042_battery: Remove obsolete cleanup for clientdataWolfram Sang2011-07-081-2/+0
| * twl4030_charger: Fix warningsGrazvydas Ignotas2011-07-081-5/+5
| * wm831x_power: Support multiple instancesMark Brown2011-07-081-3/+23
| * wm831x_backup: Support multiple instancesMark Brown2011-07-081-1/+11
| * apm_power: Fix style error in macrosKen O'Brien2011-07-081-4/+4
| * s3c_adc_battery: Fix annotation for s3c_adc_battery_probe()Mark Brown2011-07-081-1/+1
| * bq20z75: Enable detection after registeringRhyland Klein2011-07-081-0/+2
| * bq20z75: Add support for external notificationRhyland Klein2011-07-081-9/+92
* | Change Ryan Mallon's email address across the kernelRyan Mallon2011-06-161-2/+2
* | Merge git://git.infradead.org/battery-2.6Linus Torvalds2011-05-279-22/+729
|\ \ | |/
| * PXA: Use dev_pm_ops in z2_batteryMarek Vasut2011-05-201-6/+14
| * ds2760_battery: Fix rated capacity of the hx4700 1800mAh batteryPaul Parsons2011-05-201-0/+4
| * ds2760_battery: Fix indexing of the 4 active full EEPROM registersPaul Parsons2011-05-201-1/+1
| * power: Make test_power driver more dynamic.John Stultz2011-05-201-10/+266
| * bq27x00_battery: Name of cycle count propertyPali Rohár2011-05-201-5/+6
| * max8903_charger: Add GENERIC_HARDIRQS as a dependency (fixes S390 build)Anton Vorontsov2011-04-221-0/+1
| * isp1704_charger: Allow board specific powering routineKalle Jokiniemi2011-04-201-0/+22
| * gpio-charger: Add gpio_charger_resumeBenson Leung2011-04-201-0/+15
| * power_supply: Add driver for MAX8903 chargerMyungJoo Ham2011-04-203-0/+400
* | w1: add Maxim/Dallas DS2780 Stand-Alone Fuel Gauge IC supportClifton Barnes2011-05-263-0/+861
* | power_supply: Use max8925 platform_data from cellHaojian Zhuang2011-05-261-8/+2
* | Merge branch 'master' into for-nextJiri Kosina2011-04-2611-230/+885
|\ \ | |/
| * drivers: Final irq namespace conversionThomas Gleixner2011-03-291-2/+2
| * Merge git://git.infradead.org/battery-2.6Linus Torvalds2011-03-2510-226/+881
| |\
| | * bq20z75: Fix time and temp unitsBenson Leung2011-03-161-6/+12
| | * bq20z75: Fix issues with present and suspendRhyland Klein2011-03-161-11/+21
| | * z2_battery: Fix count of propertiesVasily Khoruzhick2011-03-161-0/+2
| | * s3c_adc_battery: Fix method names when PM not setHeiko Stuebner2011-03-161-2/+2
| | * z2_battery: Add MODULE_DEVICE_TABLEAxel Lin2011-03-011-0/+1
| | * ds2782_battery: Add MODULE_DEVICE_TABLEAxel Lin2011-03-011-0/+1
| | * bq20z75: Add MODULE_DEVICE_TABLEAxel Lin2011-03-011-0/+1
| | * bq20z75: Add i2c retry mechanismRhyland Klein2011-03-011-6/+31
| | * bq20z75: Add optional battery detect gpioRhyland Klein2011-03-011-31/+129
| | * Merge branch 'bq27x00-for-upstream' of git://git.metafoo.de/linux-2.6Anton Vorontsov2011-02-284-171/+574
| | |\