Subject: linux-next: manual merge of the staging tree with the thermal tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 12 Sep 2012 15:52:31 +1000

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/omap-thermal/omap-thermal-common.c between commit
76f726fb24bd ("Thermal: Remove tc1/tc2 in generic thermal layer") from
the thermal tree and commit 765a1939a364 ("staging: omap-thermal: fix
polling period settings") from the staging tree.

I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/staging/omap-thermal/omap-thermal-common.c
index b4cd6cc,46ee0a9..0000000
--- a/drivers/staging/omap-thermal/omap-thermal-common.c
+++ b/drivers/staging/omap-thermal/omap-thermal-common.c
@@@ -248,7 -268,9 +270,8 @@@ int omap_thermal_expose_sensor(struct o
  	/* Create thermal zone */
  	data->omap_thermal = thermal_zone_device_register(domain,
  				OMAP_TRIP_NUMBER, 0, data, &omap_thermal_ops,
- 				0, FAST_TEMP_MONITORING_RATE);
 -				1, 2, /*TODO: remove this when FW allows */
+ 				FAST_TEMP_MONITORING_RATE,
+ 				FAST_TEMP_MONITORING_RATE);
  	if (IS_ERR_OR_NULL(data->omap_thermal)) {
  		dev_err(bg_ptr->dev, "thermal zone device is NULL\n");
  		return PTR_ERR(data->omap_thermal);