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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 11 Mar 2011 17:09:12 +1100

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
arch/arm/mach-s3c2440/mach-gta02.c between commit 326d05c15f7f ("ARM:
S3C2440: Request usb pullup pin before using it on GTA02") from the s5p
tree and commit e27c3c5c7e0f ("ARM: s3c24xx: Switch to common GPIO
controlled UDC pullup implementation") from the usb tree.

The latter commit removes the function gta02_udc_command() which is
modified by the former.  I removed the function.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/