summaryrefslogtreecommitdiffstats
path: root/drivers/power
Commit message (Expand)AuthorAgeFilesLines
* 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
| * isp1704_charger: Detect charger after probeHeikki Krogerus2010-11-181-0/+17
| * isp1704_charger: Set isp->dev before anything needs itHeikki Krogerus2010-11-181-3/+3
| * isp1704_charger: Detect HUB/Host chargersHeikki Krogerus2010-11-181-38/+142
| * isp1704_charger: Correct length for storing modelAmeya Palande2010-11-181-1/+1
| * power_supply: Add gpio charger driverLars-Peter Clausen2010-11-183-0/+196
| * jz4740-battery: Protect against concurrent battery readingsLars-Peter Clausen2010-11-181-0/+7
| * ds2760_battery: Fix calculation of time_to_empty_nowSven Neumann2010-11-181-1/+1
* | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2011-01-131-2/+2
|\ \
| * | tree-wide: fix comment/printk typosUwe Kleine-König2010-11-011-2/+2
| |/
* | workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_dela...Tejun Heo2010-12-152-8/+4
|/
* power: Revert "power_supply: Mark twl4030_charger as broken"Samuel Ortiz2010-10-291-1/+0
* power_supply: Mark twl4030_charger as brokenAnton Vorontsov2010-10-281-0/+1
* Merge git://git.infradead.org/battery-2.6Linus Torvalds2010-10-2613-26/+1473
|\
| * power_supply: Makefile cleanupmatt mooney2010-10-061-12/+4
| * bq27x00_battery: Add missing kfree(di->bus) in bq27x00_battery_remove()Axel Lin2010-10-061-0/+1
| * power_supply: Introduce maximum current propertyHeikki Krogerus2010-10-061-0/+1
| * power_supply: Add types for USB chargersHeikki Krogerus2010-10-061-1/+2
| * ds2782_battery: Fix unitsRyan Mallon2010-10-061-6/+6
| * power_supply: Add driver for TWL4030/TPS65950 BCI chargerGrazvydas Ignotas2010-09-303-0/+572
| * bq20z75: Add support for more power supply propertiesRhyland Klein2010-09-281-48/+156
| * wm831x_power: Add missing kfree(wm831x_power) in wm831x_power_remove()Axel Lin2010-09-281-0/+1
| * jz4740-battery: Add missing kfree(jz_battery) in jz_battery_remove()Axel Lin2010-09-281-0/+1
| * ds2760_battery: Add missing kfree(di) in ds2760_battery_remove()Axel Lin2010-09-281-0/+1
| * olpc_battery: Fix endian neutral breakage for s16 valuesRichard A. Smith2010-09-281-4/+4
| * ds2760_battery: Fix W1 and W1_SLAVE_DS2760 dependencyMartin Schwidefsky2010-09-231-2/+1
| * pcf50633-charger: Add missing sysfs_remove_group()Axel Lin2010-09-221-0/+1
| * power_supply: Add driver for TI BQ20Z75 gas gauge ICRhyland Klein2010-09-063-0/+393
| * wm831x_power: Remove duplicate chg maskIan Lartey2010-09-011-1/+0
| * power_supply: Add isp1704 charger detection driverHeikki Krogerus2010-08-193-0/+377
* | apm_power: Add missing break statementAnton Vorontsov2010-09-081-0/+1
* | intel_pmic_battery: Fix battery charging status on mrstShuduo Sang2010-08-241-3/+3
|/
* Merge git://git.infradead.org/battery-2.6Linus Torvalds2010-08-125-1/+1246
|\
| * intel_mid_battery: Fix battery scalingAlan Cox2010-08-101-1/+1
| * intel_mid_battery: Fix the argument order to intel_scu_ipc_commandArjan van de Ven2010-08-101-1/+1
| * olpc_battery: Fix build failure caused by sysfs changesDavid Woodhouse2010-08-091-2/+1
OpenPOWER on IntegriCloud