9fec6060d9
Conflicts: drivers/power/Kconfig drivers/power/Makefile |
||
---|---|---|
.. | ||
apm_power.c | ||
ds2760_battery.c | ||
Kconfig | ||
Makefile | ||
olpc_battery.c | ||
palmtx_battery.c | ||
pda_power.c | ||
pmu_battery.c | ||
power_supply.h | ||
power_supply_core.c | ||
power_supply_leds.c | ||
power_supply_sysfs.c | ||
tosa_battery.c |