summaryrefslogtreecommitdiffstats
path: root/drivers/power
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Add s3c-adc-battery driverVasily Khoruzhick2010-07-233-0/+438
| * Intel MID platform battery driverNithish Mahalingam2010-06-173-0/+807
* | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-08-111-16/+0
|\ \
| * \ Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/...Russell King2010-08-061-16/+0
| |\ \
| | * | [ARM] wm97xx_batt: remove now useless header fileMarek Vasut2010-08-051-16/+0
* | | | power: Remove owner field from attribute initialization code in OLPC driverGuenter Roeck2010-08-101-1/+0
|/ / /
* | | POWER: Add JZ4740 battery driver.Lars-Peter Clausen2010-08-053-0/+457
* | | Merge git://git.infradead.org/users/cbou/battery-2.6.35Linus Torvalds2010-07-271-15/+14
|\ \ \ | | |/ | |/|
| * | ds2782_battery: Rename get_current to fix build failure / name conflictPeter Huewe2010-06-141-15/+14
* | | Merge git://git.infradead.org/users/cbou/battery-2.6.35Linus Torvalds2010-07-201-1/+1
|\ \ \ | |_|/ |/| |
| * | ds2782_battery: Fix ds2782_get_capacity return valueRyan Mallon2010-06-211-1/+1
| |/
* / [ARM] pxa/z2: fix missing include in battery driverMarek Vasut2010-06-131-9/+3
|/
* i2c: Remove all i2c_set_clientdata(client, NULL) in driversWolfram Sang2010-06-031-2/+0
* Merge git://git.infradead.org/battery-2.6Linus Torvalds2010-05-251-2/+4
|\
| * power_supply: Fix regression for 'type' propertyDaniel Mack2010-05-251-2/+4
* | Merge git://git.infradead.org/battery-2.6Linus Torvalds2010-05-2413-168/+848
|\|
| * ds2760_battery: Make charge_now and charge_full writeableDaniel Mack2010-05-191-0/+64
| * power_supply: Add support for writeable propertiesDaniel Mack2010-05-191-3/+35
| * power_supply: Use attribute groupsAnton Vorontsov2010-05-193-96/+74
| * power_supply: Add test_power driverAnton Vorontsov2010-05-183-0/+169
| * tosa_battery: Fix build error due to direct driver_data usageDmitry Eremin-Solenikov2010-05-031-2/+2
| * wm97xx_battery: Quieten sparse warning (bat_set_pdata not declared)Anton Vorontsov2010-05-021-0/+3