Messages in this thread | | | From | Kukjin Kim <> | Subject | RE: linux-next: manual merge of the samsung tree with the usb tree | Date | Wed, 19 Jun 2013 20:53:05 +0900 |
| |
Stephen Rothwell wrote: > > Hi Kukjin, > Hi,
> 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.
- Kukjin
| |