Files
linux-st/drivers/mfd
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
..
2012-03-06 18:46:57 +01:00
2012-05-01 12:00:21 +02:00
2012-05-01 12:00:21 +02:00
2012-01-09 01:03:34 +01:00
2012-05-20 17:27:06 +02:00
2012-05-20 17:27:06 +02:00
2012-05-01 12:35:41 +02:00
2012-03-06 18:46:47 +01:00
2012-06-20 14:39:36 -07:00
2012-06-20 14:39:36 -07:00
2012-01-09 00:37:44 +01:00
2012-05-04 13:25:16 +01:00
2012-05-23 16:24:14 +02:00
2012-05-01 12:00:21 +02:00
2012-05-20 17:27:05 +02:00