[lkml]   [2011]   [Mar]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Subjectlinux-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/musb/musb_core.h between commit
    59b479e0985f0b795d68331d6443a7f89c47768d ("omap: Start using
    CONFIG_SOC_OMAP") from the omap tree and commit
    da68ccec210c45eb99e461ad31b499b4e7043c41 ("usb: musb: Remove platform
    context save/restore API") from the usb tree.

    The latter removed the code modified by the former, so I did that.
    Stephen Rothwell
    [unhandled content-type:application/pgp-signature]
     \ /
      Last update: 2011-03-02 06:59    [W:0.017 / U:21.348 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site