Messages in this thread | | | Date | Tue, 8 Nov 2011 12:58:22 +1100 | From | Stephen Rothwell <> | Subject | linux-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] | |