]> 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)
commitae917ecbec609165fa2d93de13aac9cf260ca3d1
tree2b7402887e86d54bff5a123228c9059eae5e32bd
parentd5ebc885dcaa77bb4c56545088d6d06dde3b7739
parent7c487e4ebe205a6d7c2f38b38c94a803cd772097
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