]> 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>
Tue, 21 Jun 2011 17:52:56 +0000 (14:52 -0300)
committerGustavo F. Padovan <padovan@profusion.mobi>
Tue, 21 Jun 2011 17:52:56 +0000 (14:52 -0300)
commit6e77c30b60266376cc3a8a74adc3ce667c8b9cc4
tree4ce942176ec5605e81ecc3f1ed17930d852a1259
parentaeed05e42e0552de7b5c75e7c0b579a5229743a5
parent57a8f10b53b4ebf3f1bdf30b4aa81e407905b672
Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6

Conflicts:
net/bluetooth/l2cap_core.c
net/bluetooth/hci_conn.c
net/bluetooth/l2cap_core.c