Messages in this thread | | | Date | Wed, 28 Nov 2012 21:19:51 -0800 | From | Greg KH <> | Subject | 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 > c8afa6406e60 ("power: remove use of __devinit") from the driver-core tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Looks good, thanks.
greg k-h
| |