]> git.baikalelectronics.ru Git - kernel.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
authorGustavo F. Padovan <padovan@profusion.mobi>
Thu, 21 Apr 2011 00:47:07 +0000 (21:47 -0300)
committerGustavo F. Padovan <padovan@profusion.mobi>
Thu, 21 Apr 2011 00:47:07 +0000 (21:47 -0300)
commit88438d91894f81063b415723428295272c6779bc
treefd006445c562749de9a07fe6e5363bab5d285a20
parenteace7a9660e95438f77ced34b368f5345f58a57e
parentcb46fe1e7c56b4b04bff065ecbc699ca8028c91d
Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6

Conflicts:
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c
net/bluetooth/hci_core.c
net/bluetooth/hci_event.c
net/bluetooth/l2cap_core.c