Prev: Please pull from lost-spurious-irq
Next: [PATCH] firewire: ohci: release channel in error path
From: Greg KH on 28 Jul 2010 10:00
On Wed, Jul 28, 2010 at 03:27:36PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/Kconfig between commit
> 44d349d2b19019e0b5912bc4e6c8531e50b394aa ("V4L/DVB: staging/lirc: wire up
> Kconfig and Makefile bits") from the v4l-dvb tree and several commits
> from the staging-next tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.

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(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: Please pull from lost-spurious-irq
Next: [PATCH] firewire: ohci: release channel in error path