RE: linux-next: manual merge of the samsung tree with the usb tree
From: Kukjin Kim
Date: Wed Jun 19 2013 - 07:53:13 EST
Stephen Rothwell wrote:
> Hi Kukjin,
> Today's linux-next merge of the samsung tree got a conflict in
> drivers/usb/Kconfig between commit d9ea21a77927 ("usb: host: make
> USB_ARCH_HAS_?HCI obsolete") from the usb tree and commit 58d5b72088cc
> ("USB: Check for ARCH_EXYNOS separately") from the samsung tree.
> I fixed it up (USB_ARCH_HAS_EHCI is no longer used) and can carry the fix
> as necessary (no action is required).
Looks good to me, thanks.
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/