On Thu, Nov 29, 2012 at 02:43:02PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/gpio/gpio-tps6586x.c between commit fe39f2f4dc84 ("mfd: Implement
> tps6586x gpio_to_irq") from the mfd tree and commit 3836309d9346 ("gpio:
> remove use of __devinit") 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 majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
