Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Nov 2011 19:54:33 +0000 (14:54 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Nov 2011 19:54:33 +0000 (14:54 -0500)
commit312fef7d18adda2be822d31916547f84ed6af28b
tree095d936b751b0a92946fcf710fb74dea7f8f33f7
parent5e819059a20b0fc5a71875f28b4cae359e38d85a
parent2aeabcbedd51aef94b61d05b57246d1db4984453
Merge branch 'master' of git://git./linux/kernel/git/padovan/bluetooth-next

Conflicts:
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c
drivers/bluetooth/btusb.c
include/net/bluetooth/l2cap.h
net/bluetooth/hci_conn.c
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c
net/bluetooth/rfcomm/sock.c