Subject: linux-next: manual merge of the arm tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 10 Jul 2008 14:33:54 +1000

Hi Russell,

Today's linux-next merge of the arm tree got a conflict in
drivers/usb/gadget/ether.c between commit
41df25fad30d0e88ddc042358556f19a72d70054 ("usb ethernet gadget: use
composite gadget framework") from the usb tree and commit
7a8576204333d133d58cbcc59dacf49a5546e3e4 ("[ARM] 5120/1: pxa: correct
platform driver names for PXA25x and PXA27x UDC drivers") from the arm
tree.

I am not actually sure what to do with this.  To make it build, I have
just take the usb tree's version, but there is probably more to it than
that.

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