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)
commit828d7d7b19446bf5a40928da47955c575a454c75
treefd006445c562749de9a07fe6e5363bab5d285a20
parent26954c7f26068b6ced108806fdd39aee5cd54e6f
parent069f40fc07f6df3da325e7ea1698a0d6247983d5
Merge /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