On Wed, Feb 06, 2013 at 04:21:51PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/spi/spi-s3c64xx.c between commit 4eb770067f3a ("spi/s3c64xx: Use
> devm_clk_get() and devm_request_irq()") from the tree and commit
> b0ee5605234a ("spi: 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 to me, thanks.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
