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

From: Greg KH
Date: Mon May 14 2012 - 10:28:10 EST

On Mon, May 14, 2012 at 05:47:43PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> Today's linux-next merge of the usb tree got conflicts in
> arch/arm/mach-exynos/mach-nuri.c and
> arch/arm/mach-exynos/mach-universal_c210.c between commits db6856e8d8ab
> ("ARM: EXYNOS: Add DRM core support for NURI board") and 6dafa4aead1b
> ("ARM: EXYNOS: Add DRM core device support for Universal C210 board")
> from the s5p tree and commit 126625e1bf32 ("usb:hsotg:samsung:cosmetic
> Move <linux/platform_data/s3c-hsotg.h> to proper place") from the usb
> tree.
> Just context changes. 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@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at