Messages in this thread | | | Date | Wed, 12 Sep 2012 09:13:51 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the thermal tree |
| |
On Wed, Sep 12, 2012 at 03:52:31PM +1000, Stephen Rothwell wrote: > 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). >
Looks good to me, thanks.
greg k-h
| |