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

[Stephen Rothwell]

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
82d3a76a88cd ("Thermal: Pass zone parameters as argument to
tzd_register") from the thermal tree and commit 765a1939a364 ("staging:
omap-thermal: fix polling period settings") from the staging tree.

I just used the thermal tree version and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature