Anton Vorontsov f056878332 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:
	drivers/power/wm97xx_battery.c

2009-09-23 03:49:27 +04:00

..

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_core.c

…

power_supply_leds.c

…

power_supply_sysfs.c

…

power_supply.h

…

tosa_battery.c

…

wm97xx_battery.c

…

wm831x_power.c

…

wm8350_power.c

…