Re: linux-next: manual merge of the driver-core tree with the battery tree

On Thu, Nov 29, 2012 at 03:09:33PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/power/ab8500_btemp.c between commit bd9e8ab2d58d ("ab8500: Add > devicetree support for btemp") from the battery tree and commit > c8afa6406

Re: linux-next: manual merge of the driver-core tree with the battery tree

On Thu, Nov 29, 2012 at 03:11:42PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/power/ab8500_charger.c between commit 4aef72dbb2e8 ("ab8500: Add > devicetree support for charger") from the battery tree and commit > c8afa

Re: linux-next: manual merge of the driver-core tree with the battery tree

On Thu, Nov 29, 2012 at 03:15:58PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/power/abx500_chargalg.c between commit a12810ab9fcf ("ab8500: Add > devicetree support for chargalg") from the battery tree and commit > c8a

Re: linux-next: manual merge of the driver-core tree with the battery tree

On Thu, Nov 29, 2012 at 03:13:36PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/power/ab8500_fg.c between commit e0f1abeba5c2 ("ab8500: Add > devicetree support for fuelgauge") from the battery tree and commit > c8afa640

Re: linux-next: manual merge of the driver-core tree with the battery tree

On Thu, Nov 29, 2012 at 03:20:08PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/power/max8925_power.c between commit eba3b670a916 > ("max8925_power: Add support for device-tree initialization") from the > battery tree an

linux-next: manual merge of the driver-core tree with the battery tree

Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/power/max8925_power.c between commit eba3b670a916 ("max8925_power: Add support for device-tree initialization") from the battery tree and commit c8afa6406e60 ("power: remove use of __devinit") from the driver-core

linux-next: manual merge of the driver-core tree with the battery tree

Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/power/abx500_chargalg.c between commit a12810ab9fcf ("ab8500: Add devicetree support for chargalg") from the battery tree and commit c8afa6406e60 ("power: remove use of __devinit") from the driver-core tree. I fix

linux-next: manual merge of the driver-core tree with the battery tree

Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/power/ab8500_fg.c between commit e0f1abeba5c2 ("ab8500: Add devicetree support for fuelgauge") from the battery tree and commit c8afa6406e60 ("power: remove use of __devinit") from the driver-core tree. I fixed it

linux-next: manual merge of the driver-core tree with the battery tree

Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/power/ab8500_charger.c between commit 4aef72dbb2e8 ("ab8500: Add devicetree support for charger") from the battery tree and commit c8afa6406e60 ("power: remove use of __devinit") from the driver-core tree. I fixed

linux-next: manual merge of the driver-core tree with the battery tree

Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/power/ab8500_btemp.c between commit bd9e8ab2d58d ("ab8500: Add devicetree support for btemp") from the battery tree and commit c8afa6406e60 ("power: remove use of __devinit") from the driver-core tree. I fixed it