lkml.org 
[lkml]   [2011]   [Nov]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the bluetooth tree with Linus tree
    Hi Gustavo,

    Today's linux-next merge of the bluetooth tree got a conflict in
    net/bluetooth/mgmt.c between commit dafbde395ed5 ("Bluetooth: Set
    HCI_MGMT flag only in read_controller_info") from Linus' tree and commit
    e395042c2836 ("Bluetooth: Convert power off mechanism to use
    delayed_work") from the bluetooth tree.

    I fixed it up and can carry the fix as necessary.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2011-11-08 03:01    [W:0.022 / U:93.944 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site