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

[Greg KH]

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 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 majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/