On Fri, May 18, 2012 at 05:22:24PM +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 3a36dd068f43 ("ARM: EXYNOS: Add s3c-hsotg
device support for Universal C210 board") from the usb tree.

I fixed it up (see below) and can carry the fix as necessary.

Looks good to me, thanks.

greg k-h