lkml.org 
[lkml]   [2013]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the usb tree with the driver-core tree
Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/musb/omap2430.c between commit 148e11349b0c ("usb: Convert to
devm_ioremap_resource()") from the driver-core tree and commit
ca784be36cc7 ("usb: start using the control module driver") from the usb
tree.

I fixed it up (the latter removed the code modified by the former, so I
did that) and can carry the fix as necessary (no action is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-01-28 12:03    [W:0.052 / U:1.144 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site