On Wed, May 16, 2012 at 06:03:03PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> arch/arm/mach-exynos/mach-universal_c210.c between commit 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-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
