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

[Greg KH]

On Thu, Nov 29, 2012 at 03:00:44PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/mfd/tps65090.c between various commits from the mfd tree and
> commits 84449216b01f ("mfd: remove use of __devexit_p"), f791be492f76
> ("mfd: remove use of __devinit") and 4740f73fe538 ("mfd: remove use of
> __devexit") from the driver-core tree.
> 
> I fixed it up (by using the mfd tree version) 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/