summaryrefslogtreecommitdiffstats
path: root/drivers/power
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\
| | | * bq27x00: Use single i2c_transfer call for property readGrazvydas Ignotas2011-02-221-16/+11
| | | * bq27x00: Cleanup bq27x00_i2c_readLars-Peter Clausen2011-02-221-21/+24
| | | * bq27x00: Minor cleanupsPali Rohár2011-02-221-2/+2
| | | * bq27x00: Give more specific reports on battery statusLars-Peter Clausen2011-02-221-1/+6
| | | * bq27x00: Add MODULE_DEVICE_TABLEPali Rohár2011-02-221-0/+1
| | | * bq27x00: Add new propertiesPali Rohár2011-02-221-1/+151
| | | * bq27x00: Poll battery stateLars-Peter Clausen2011-02-221-5/+53
| | | * bq27x00: Cache battery registersLars-Peter Clausen2011-02-221-121/+150
| | | * bq27x00: Add bq27000 supportLars-Peter Clausen2011-02-222-15/+183
| | | * bq27x00: Prepare code for addition of bq27000 platform driverLars-Peter Clausen2011-02-221-47/+39
| | | * bq27x00: Return -ENODEV for properties if the battery is not presentLars-Peter Clausen2011-02-221-2/+7
| | | * bq27x00: Fix CURRENT_NOW propertyPali Rohár2011-02-221-2/+5
| | | * bq27x00: Improve temperature property precessionLars-Peter Clausen2011-02-221-1/+1
| | | * bq27x00: Add type propertyLars-Peter Clausen2011-02-221-0/+4
| | | * power_supply: Initialize changed_work before calling device_addLars-Peter Clausen2011-02-221-2/+2
| | | * power_supply: Ignore -ENODATA errors when generating ueventsLars-Peter Clausen2011-02-221-1/+1
| | * | twl4030_charger: Make the driver atomic notifier safeHeikki Krogerus2011-02-281-6/+19
| | |/
| | * power_supply: Add new LED trigger charging-blink-solid-fullVasily Khoruzhick2011-01-311-0/+19
| | * bq20z75: Add support for charge propertiesRhyland Klein2011-01-311-11/+87
| * | jz4740: silence warnings related to mfd_get_cell changesAndres Salomon2011-03-231-1/+1
| * | mfd: mfd_cell is now implicitly available to jz4740 driversAndres Salomon2011-03-231-1/+1
| |/
* / treewide: remove extra semicolonsJustin P. Mattock2011-04-101-1/+1
|/
* Merge git://git.infradead.org/battery-2.6Linus Torvalds2011-01-1415-69/+766
|\
| * power_supply: Add MAX17042 Fuel Gauge DriverMyungJoo Ham2011-01-143-0/+250
| * olpc_battery: Fix up XO-1.5 properties listSascha Silbe2011-01-131-0/+4
| * olpc_battery: Add support for CURRENT_NOW and VOLTAGE_NOWSascha Silbe2011-01-121-0/+4
| * olpc_battery: Add support for CHARGE_NOWSascha Silbe2011-01-121-0/+24
| * olpc_battery: Add support for CHARGE_FULL_DESIGNSascha Silbe2011-01-121-0/+54
| * olpc_battery: Ambient temperature is not available on XO-1.5Daniel Drake2011-01-121-3/+25
| * jz4740-battery: Should include linux/io.hAnton Vorontsov2010-12-221-0/+1
| * s3c_adc_battery: Add gpio_inverted field to pdataVasily Khoruzhick2010-12-221-3/+9
| * power_supply: Don't use flush_scheduled_work()Tejun Heo2010-12-226-20/+20
| * power_supply: Fix use after free and memory leakVasiliy Kulikov2010-12-221-2/+2
| * gpio-charger: Fix potential race between irq handler and probe/removeLars-Peter Clausen2010-12-221-15/+14
| * gpio-charger: Provide default name for the power_supplyLars-Peter Clausen2010-12-221-1/+1
| * gpio-charger: Check result of kzallocLars-Peter Clausen2010-12-221-0/+4
| * jz4740-battery: Check if platform_data is suppliedLars-Peter Clausen2010-11-181-0/+5