[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date: Wed, 11 Nov 2009 19:30:13 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Felipe Balbi <felipe.balbi@...ia.com>,
Tony Lindgren <tony@...mide.com>, <linux-omap@...r.kernel.org>
Subject: linux-next: manual merge of the usb tree with the omap tree
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ehci-omap.c between commit
7cb07f72711d3e10763ca7d7a9fcd7ac788aabf4 ("omap: ehci: Add platform init
code") from the omap tree and commit
9e92239693d7010d2e710a445f46d6a738b09171 ("USB: host: ehci: introduce
omap ehci-hcd driver") from the usb tree.
Both commits create this file but I used the omap tree version because
commit ce491cf85466c3377228c5a852ea627ec5136956 ("omap: headers: Move
remaining headers from include/mach to include/plat") from the omap tree
moved one included header file (mach/usb.h -> plat/usb.h).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists