]> 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)
commit5dc3c2a146da212c48ddf742e9748d72e067144d
tree4ce942176ec5605e81ecc3f1ed17930d852a1259
parent5a0de86838536532ed58ff28c93c4971d720689c
parent1d8531caebda3f8bb46fd1437ccb0ebcb20fb74f
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