Re: linux-next: manual merge of the gpio-lw tree with thedriver-core tree

[Greg KH]

On Tue, Dec 11, 2012 at 03:13:10PM +1100, Stephen Rothwell wrote:
> Hi Linus,
> 
> Today's linux-next merge of the gpio-lw tree got a conflict in
> drivers/gpio/gpio-stmpe.c between commit 3836309d9346 ("gpio: remove use
> of __devinit") from the driver-core tree and commit fc13d5a5b17c ("gpio:
> Provide the STMPE GPIO driver with its own IRQ Domain") from the gpio-lw
> 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/