59f91e5dd0
Conflicts: include/linux/mmzone.h Synced with Linus' tree so that trivial patch can be applied on top of up-to-date code properly. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> |
||
---|---|---|
.. | ||
ab8500_btemp.c | ||
ab8500_charger.c | ||
ab8500_fg.c | ||
abx500_chargalg.c | ||
apm_power.c | ||
bq27x00_battery.c | ||
charger-manager.c | ||
collie_battery.c | ||
da9030_battery.c | ||
da9052-battery.c | ||
ds2760_battery.c | ||
ds2780_battery.c | ||
ds2781_battery.c | ||
ds2782_battery.c | ||
gpio-charger.c | ||
intel_mid_battery.c | ||
isp1704_charger.c | ||
jz4740-battery.c | ||
Kconfig | ||
lp8727_charger.c | ||
Makefile | ||
max8903_charger.c | ||
max8925_power.c | ||
max8997_charger.c | ||
max8998_charger.c | ||
max17040_battery.c | ||
max17042_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 | ||
sbs-battery.c | ||
smb347-charger.c | ||
test_power.c | ||
tosa_battery.c | ||
twl4030_charger.c | ||
wm97xx_battery.c | ||
wm831x_backup.c | ||
wm831x_power.c | ||
wm8350_power.c | ||
z2_battery.c |