Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
authorGustavo F. Padovan <padovan@profusion.mobi>
Thu, 9 Jun 2011 19:33:54 +0000 (16:33 -0300)
committerGustavo F. Padovan <padovan@profusion.mobi>
Thu, 9 Jun 2011 19:33:54 +0000 (16:33 -0300)
commit448f2627c169092d2091a1be22feb6a7775f6201
tree8d12460ba978d4f031715ae4bd9e0bc6fee4c5ab
parent5a9d0a3ffbc40ea1f5a0636501e7599cbb327bcc
parent6de6c18d8d3b2a82cc1c657f005e61b1c1f2f886
Merge /linux/kernel/git/padovan/bluetooth-2.6

Conflicts:
net/bluetooth/rfcomm/sock.c
net/bluetooth/hci_event.c
net/bluetooth/l2cap_sock.c
net/bluetooth/rfcomm/sock.c