From: Anton Vorontsov Date: Tue, 31 Jul 2012 11:59:42 +0000 (-0700) Subject: Merge with upstream to accommodate with thermal changes X-Git-Tag: v3.6-rc1~31^2~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6db06a53b1dcf4e9da4aba143e2eb4d63418abb;p=pandora-kernel.git Merge ... upstream to accommodate with thermal changes This merge is performed to take commit c56f5c0342dfee11a1 ("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 --- e6db06a53b1dcf4e9da4aba143e2eb4d63418abb Reading git-diff-tree failed