FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-27 20:07:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
76d8a23b12
linux/drivers/power
History
Anton Vorontsov 76d8a23b12 Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 
The merge is merely to fix conflicts before sending a pull request.

Conflicts:
	drivers/power/ab8500_btemp.c
	drivers/power/ab8500_charger.c
	drivers/power/ab8500_fg.c
	drivers/power/abx500_chargalg.c
	drivers/power/max8925_power.c

Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
2012-12-11 22:15:57 -08:00
..
avs power: remove use of __devexit 2012-11-28 11:43:22 -08:00
88pm860x_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
88pm860x_charger.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
ab8500_bmdata.c ab8500: Add devicetree support for btemp 2012-11-18 19:37:14 -08:00
ab8500_btemp.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 2012-12-11 22:15:57 -08:00
ab8500_charger.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 2012-12-11 22:15:57 -08:00
ab8500_fg.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 2012-12-11 22:15:57 -08:00
abx500_chargalg.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 2012-12-11 22:15:57 -08:00
apm_power.c device.h: cleanup users outside of linux/include (C files) 2012-03-11 14:27:37 -04:00
bq27x00_battery.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 2012-12-11 22:15:57 -08:00
bq2415x_charger.c bq2415x_charger: Fix style issues 2012-11-18 15:58:42 -08:00
charger-manager.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
collie_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
da9030_battery.c da9030_battery: Don't use 0 as NULL 2012-08-22 20:00:45 -07:00
da9052-battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
ds2760_battery.c workqueue: use mod_delayed_work() instead of cancel + queue 2012-08-13 16:27:37 -07:00
ds2780_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
ds2781_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
ds2782_battery.c ds2782_battery: Fix signedness bug in ds278x_read_reg16() 2012-11-18 14:46:39 -08:00
generic-adc-battery.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 2012-12-11 22:15:57 -08:00
gpio-charger.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
intel_mid_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
isp1704_charger.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
jz4740-battery.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 2012-12-11 22:15:57 -08:00
Kconfig ab8500: Add devicetree support for btemp 2012-11-18 19:37:14 -08:00
lp8727_charger.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
lp8788-charger.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 2012-12-11 22:15:57 -08:00
Makefile ab8500: Add devicetree support for fuelgauge 2012-11-18 19:37:04 -08:00
max8903_charger.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
max8925_power.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 2012-12-11 22:15:57 -08:00
max8997_charger.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
max8998_charger.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
max17040_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
max17042_battery.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 2012-12-11 22:15:57 -08:00
olpc_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
pcf50633-charger.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
pda_power.c pda_power: Remove ac_draw_failed goto and label 2012-09-21 16:50:11 -07:00
pmu_battery.c
power_supply_core.c power_supply: Register power supply for thermal cooling device 2012-11-17 20:32:33 -08:00
power_supply_leds.c device.h: cleanup users outside of linux/include (C files) 2012-03-11 14:27:37 -04:00
power_supply_sysfs.c power_supply: Add support for CHARGE_CONTROL_* attributes 2012-11-17 20:21:43 -08:00
power_supply.h device.h: cleanup users outside of linux/include (C files) 2012-03-11 14:27:37 -04:00
rx51_battery.c power_supply: Add new Nokia RX-51 (N900) power supply battery driver 2012-11-18 15:11:33 -08:00
s3c_adc_battery.c power: remove use of __devinit 2012-11-28 11:43:22 -08:00
sbs-battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
smb347-charger.c power: remove use of __devexit_p 2012-11-28 11:43:22 -08:00
test_power.c test_power: Add VOLTAGE_NOW and BATTERY_TEMP properties 2012-06-20 22:45:41 -07:00
tosa_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
twl4030_charger.c twl4030_charger: Change TWL4030_MODULE_* ids to TWL_MODULE_* 2012-11-18 16:14:52 -08:00
wm97xx_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
wm831x_backup.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
wm831x_power.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
wm8350_power.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
z2_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00