lkml.org 
[lkml]   [2013]   [Oct]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the usb-gadget tree
Hi,

On Thu, Oct 10, 2013 at 10:20:30PM +0100, Mark Brown wrote:
> Today's linux-next merge of the usb-gadget tree got conflicts in
> drivers/usb/musb/davinci.c caused by an add in ea78201e2 (usb: musb:
> davinci: fix resources passed to MUSB driver for DM6467) adjacent to
> the modification of the device registration in 4c9ad1059 (DMA-API: usb:
> musb: use platform_device_register_full() to avoid directly messing with
> dma masks) from the ARM tree.
>
> I've fixed trivially and can carry as required.

Thank you.

--
balbi
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-10-11 02:21    [W:0.261 / U:0.400 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site