linux-next: manual merge of the thermal tree with Linus' tree

Hi all, Today's linux-next merge of the thermal tree got conflicts in: Documentation/driver-api/thermal/index.rst Documentation/driver-api/thermal/sysfs-api.rst Documentation/driver-api/thermal/x86_pkg_temperature_thermal.rst between commit: eaf7b46083a7e34 ("docs: thermal: add it to th

Re: linux-next: manual merge of the thermal tree with Linus' tree

Hi, Stephen, On Mon, 2012-11-05 at 11:46 +1100, Stephen Rothwell wrote: > Hi Zhang, > > Today's linux-next merge of the thermal tree got a conflict in > drivers/thermal/rcar_thermal.c between commit 608f62b996c6 ("thermal: > solve compilation errors in rcar_thermal") from Linus' tree and commit >

Re: linux-next: manual merge of the thermal tree with Linus' tree

On Mon, 2012-11-05 at 11:46 +1100, Stephen Rothwell wrote: > Hi Zhang, > > Today's linux-next merge of the thermal tree got a conflict in > drivers/thermal/rcar_thermal.c between commit 608f62b996c6 ("thermal: > solve compilation errors in rcar_thermal") from Linus' tree and commit > ebbf0f11e7b4

linux-next: manual merge of the thermal tree with Linus' tree

Hi Zhang, Today's linux-next merge of the thermal tree got a conflict in drivers/thermal/rcar_thermal.c between commit 608f62b996c6 ("thermal: solve compilation errors in rcar_thermal") from Linus' tree and commit ebbf0f11e7b4 ("Thermal: Pass zone parameters as argument to tzd_register") from the