Anton Vorontsov e6db06a53b Merge with upstream to accommodate with thermal changes ... This merge is performed to take commit c56f5c0342 ("Thermal: Make Thermal trip points writeable") out of Linus' tree and then fixup power supply class. This is needed since thermal stuff added a new argument: CC drivers/power/power_supply_core.o drivers/power/power_supply_core.c: In function ‘psy_register_thermal’: drivers/power/power_supply_core.c:204:6: warning: passing argument 3 of ‘thermal_zone_device_register’ makes integer from pointer without a cast [enabled by default] include/linux/thermal.h:154:29: note: expected ‘int’ but argument is of type ‘struct power_supply *’ drivers/power/power_supply_core.c:204:6: error: too few arguments to function ‘thermal_zone_device_register’ include/linux/thermal.h:154:29: note: declared here make[1]: *** [drivers/power/power_supply_core.o] Error 1 make: *** [drivers/power/] Error 2 Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>		2012-07-31 05:16:47 -07:00
..
ab8500_btemp.c	ab8500: Clean up probe routines	2012-05-05 04:55:50 -07:00
ab8500_charger.c	ab8500: Clean up probe routines	2012-05-05 04:55:50 -07:00
ab8500_fg.c	ab8500: Clean up probe routines	2012-05-05 04:55:50 -07:00
abx500_chargalg.c	ab8500: Turn unneeded global symbols into local ones	2012-03-26 20:41:14 +04: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	bq27x00_battery: Add support for BQ27425 chip	2012-07-13 20:26:20 -07:00
charger-manager.c	charger-manager: Set current limit of regulator for over current protection	2012-07-13 18:31:17 -07:00
collie_battery.c	Merge git://git.infradead.org/users/cbou/battery-urgent	2012-01-10 20:55:11 +04:00
da9030_battery.c	power_supply: Convert drivers/power/* to use module_platform_driver()	2012-01-04 09:12:07 +04:00
da9052-battery.c	da9052-battery: Convert to use module_platform_driver	2012-03-26 20:41:17 +04:00
ds2760_battery.c	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
ds2780_battery.c	power_supply: Convert drivers/power/* to use module_platform_driver()	2012-01-04 09:12:07 +04:00
ds2781_battery.c	ds2781_battery: w1_ds2781_read() should be static	2012-06-17 21:24:00 -07:00
ds2782_battery.c	power_supply: Convert i2c drivers to module_i2c_driver	2012-03-26 20:41:22 +04:00
gpio-charger.c	gpio-charger: Use cansleep version of gpio_set_value	2012-06-19 20:48:37 -07:00
intel_mid_battery.c	power_supply: Convert drivers/power/* to use module_platform_driver()	2012-01-04 09:12:07 +04:00
isp1704_charger.c	isp1704_charger: Use after free on probe error	2012-05-05 20:02:35 -07:00
jz4740-battery.c	jz4740-battery: Fix signedness bug	2012-01-06 05:57:17 +04:00
Kconfig	charger-manager: Fix build break related to EXTCON	2012-07-15 22:15:12 -07:00
lp8727_charger.c	lp8727_charger: Move header file into platform_data directory	2012-07-14 01:14:35 -07:00
Makefile	Various small bugfixes and enhancements, plus two new drivers:	2012-03-30 16:09:02 -07:00
max8903_charger.c	power_supply: Convert drivers/power/* to use module_platform_driver()	2012-01-04 09:12:07 +04:00
max8925_power.c	power_supply: Convert drivers/power/* to use module_platform_driver()	2012-01-04 09:12:07 +04:00
max8997_charger.c	max8997_charger: Remove duplicate module.h	2012-01-06 04:59:25 +04:00
max8998_charger.c	Revert "max8998_charger: Include linux/module.h just once"	2012-03-26 20:41:27 +04:00
max17040_battery.c	power_supply: Convert i2c drivers to module_i2c_driver	2012-03-26 20:41:22 +04:00
max17042_battery.c	max17042_battery: Support CHARGE_COUNTER power supply attribute	2012-06-19 16:48:08 -07:00
olpc_battery.c	olpc-battery: update CHARGE_FULL_DESIGN property for BYD LiFe batteries	2012-07-16 01:39:23 -07:00
pcf50633-charger.c	power_supply: Convert drivers/power/* to use module_platform_driver()	2012-01-04 09:12:07 +04:00
pda_power.c	pda_power: Complain if regulator operations fail	2012-06-17 20:19:59 -07:00
pmu_battery.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
power_supply.h	device.h: cleanup users outside of linux/include (C files)	2012-03-11 14:27:37 -04:00
power_supply_core.c	Merge with upstream to accommodate with thermal changes	2012-07-31 05:16:47 -07: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 min/max alert properties for CAPACITY, TEMP, TEMP_AMBIENT	2012-07-13 20:41:58 -07:00
s3c_adc_battery.c	s3c_adc_battery: Average over more than one adc sample	2012-01-06 06:13:35 +04:00
sbs-battery.c	sbs-battery: Don't trigger false supply_changed event	2012-06-19 19:26:40 -07:00
smb347-charger.c	smb347-charger: Add constant charge and current properties	2012-06-19 16:47:37 -07: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_supply: Convert drivers/power/* to use module_platform_driver()	2012-01-04 09:12:07 +04:00
twl4030_charger.c	twl4030_charger: Allow charger to control the regulator that feeds it	2012-06-19 19:13:27 -07:00
wm97xx_battery.c	wm97xx_battery: Use DEFINE_MUTEX() for work_lock	2012-01-06 05:00:30 +04:00
wm831x_backup.c	power_supply: Convert drivers/power/* to use module_platform_driver()	2012-01-04 09:12:07 +04:00
wm831x_power.c	mfd: Convert wm831x to irq_domain	2012-05-20 17:27:07 +02:00
wm8350_power.c	power_supply: Convert drivers/power/* to use module_platform_driver()	2012-01-04 09:12:07 +04:00
z2_battery.c	power_supply: Convert i2c drivers to module_i2c_driver	2012-03-26 20:41:22 +04:00