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

2012-09-25 Thread Valentin, Eduardo
Hello, On Tue, Sep 25, 2012 at 6:11 PM, Greg KH wrote: > > On Tue, Sep 25, 2012 at 04:13:55PM +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 > > 82d3a76a88cd

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

2012-09-25 Thread Greg KH
On Tue, Sep 25, 2012 at 04:13:55PM +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 > 82d3a76a88cd ("Thermal: Pass zone parameters as argument to > tzd_register") from

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

2012-09-25 Thread 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

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

2012-09-25 Thread 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

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

2012-09-25 Thread Greg KH
On Tue, Sep 25, 2012 at 04:13:55PM +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 82d3a76a88cd (Thermal: Pass zone parameters as argument to tzd_register) from the

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

2012-09-25 Thread Valentin, Eduardo
Hello, On Tue, Sep 25, 2012 at 6:11 PM, Greg KH g...@kroah.com wrote: On Tue, Sep 25, 2012 at 04:13:55PM +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

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

2012-09-12 Thread Greg KH
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

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

2012-09-12 Thread Valentin, Eduardo
Hello Stephen, On Wed, Sep 12, 2012 at 8:52 AM, 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 >

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

2012-09-12 Thread Valentin, Eduardo
Hello Stephen, On Wed, Sep 12, 2012 at 8:52 AM, Stephen Rothwell s...@canb.auug.org.au 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

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

2012-09-12 Thread Greg KH
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

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

2012-09-11 Thread 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 76f726fb24bd ("Thermal: Remove tc1/tc2 in generic thermal layer") from the thermal tree and commit 765a1939a364 ("staging: omap-thermal: fix polling period

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

2012-09-11 Thread 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 76f726fb24bd (Thermal: Remove tc1/tc2 in generic thermal layer) from the thermal tree and commit 765a1939a364 (staging: omap-thermal: fix polling period