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 > 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/