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)
commit0555891184a5c18df0e2349872e7ecf9701fc5b5
tree4ce942176ec5605e81ecc3f1ed17930d852a1259
parente13e21dc5d06bd9ed4a88daf057b8dbe80c220de
parent330605423ca6eafafb8dcc27502bce1c585d1b06
Merge /linux/kernel/git/padovan/bluetooth-2.6

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