mirror of https://github.com/torvalds/linux.git
16bb85bc12
* git://git.infradead.org/battery-2.6:
intel_mid_battery: Fix battery scaling
intel_mid_battery: Fix the argument order to intel_scu_ipc_command
olpc_battery: Fix build failure caused by sysfs changes
Add s3c-adc-battery driver
Intel MID platform battery driver
Fix up trivial conflicts (battery drivers added from different branches)
in drivers/power/{Kconfig,Makefile}
|
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| apm_power.c | ||
| bq27x00_battery.c | ||
| collie_battery.c | ||
| da9030_battery.c | ||
| ds2760_battery.c | ||
| ds2782_battery.c | ||
| intel_mid_battery.c | ||
| jz4740-battery.c | ||
| max8925_power.c | ||
| max17040_battery.c | ||
| olpc_battery.c | ||
| pcf50633-charger.c | ||
| pda_power.c | ||
| pmu_battery.c | ||
| power_supply.h | ||
| power_supply_core.c | ||
| power_supply_leds.c | ||
| power_supply_sysfs.c | ||
| s3c_adc_battery.c | ||
| test_power.c | ||
| tosa_battery.c | ||
| wm97xx_battery.c | ||
| wm831x_backup.c | ||
| wm831x_power.c | ||
| wm8350_power.c | ||
| z2_battery.c | ||