]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>
Fri, 27 Sep 2013 14:56:14 +0000 (11:56 -0300)
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>
Fri, 27 Sep 2013 14:56:14 +0000 (11:56 -0300)
commit613c5152d55577f9761f49ca4ca6d6244e9a44d5
tree2b7402887e86d54bff5a123228c9059eae5e32bd
parent3925f08357c29ded4c9fb503ddbe0d1af1e434eb
parentf661edff412aa9da753b01ec607d0cdb4edff79c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

Conflicts:
net/bluetooth/hci_core.c
include/net/bluetooth/hci.h
net/bluetooth/hci_core.c
net/bluetooth/hci_event.c
net/bluetooth/l2cap_core.c