Re: linux-next: manual merge of the usb tree with the sh tree

[Greg KH]

On Mon, Dec 06, 2010 at 12:47:23PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> arch/sh/Kconfig between commit f020c92de48246510623162fb22d60d91810cc56
> ("sh: Enable optional gpiolib for all CPUs with pinmux tables") from the
> sh tree and commit e3e9887ee9de36d8e2bef972ad74a42abd7a44c4 ("sh: Convert
> to USB_ARCH_HAS_OHCI/EHCI selects") from the usb tree.
> 
> Just context changes.  I fixed ti up (see below) and can carry the fix as
> necessary.

Looks good, thanks for carrying this.

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/