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

[Greg KH]

On Mon, Oct 28, 2013 at 10:20:07PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/mmc/host/mvsdio.c between commit 50596285e0be ("mmc: mvsdio:
> Remove redundant suspend and resume callbacks") from the mmc tree and
> commit 1867adee6ed7 ("mmc: mvsdio: fix deferred probe from __init") from
> the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me, 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/