lkml.org 
[lkml]   [2013]   [Oct]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: linux-next: manual merge of the usb tree with the tree
    On Mon, Oct 28, 2013 at 11:01:52PM +1100, Stephen Rothwell wrote:
    > Hi Greg,
    >
    > Today's linux-next merge of the usb tree got a conflict in
    > drivers/Kconfig between commit 12cc4b3827f8 ("PowerCap: Add to drivers
    > Kconfig and Makefile") from the pm tree and commit ff764963479a
    > ("drivers: phy: add generic PHY framework") from the usb tree.
    >
    > I fixed it up (see below) and can carry the fix as necessary (no action
    > is required).

    Looks fine to me, thanks.

    greg k-h


    \
     
     \ /
      Last update: 2013-10-31 23:41    [W:3.039 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site