mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
f056878332
Conflicts: drivers/power/wm97xx_battery.c |
||
---|---|---|
.. | ||
apm_power.c | ||
bq27x00_battery.c | ||
da9030_battery.c | ||
ds2760_battery.c | ||
ds2782_battery.c | ||
Kconfig | ||
Makefile | ||
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 | ||
tosa_battery.c | ||
wm97xx_battery.c | ||
wm831x_power.c | ||
wm8350_power.c |