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

[Greg KH]

On Wed, Jan 23, 2013 at 03:15:52PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/gpio/gpio-mvebu.c between commit 11c0ceec073c ("gpio: mvebu:
> Don't free chip label memory") from Linus' tree and commit 641d03422a59
> ("gpio: Convert to devm_ioremap_resource()") 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/