Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
authorGustavo F. Padovan <padovan@profusion.mobi>
Mon, 19 Dec 2011 13:37:53 +0000 (11:37 -0200)
committerGustavo F. Padovan <padovan@profusion.mobi>
Mon, 19 Dec 2011 13:37:53 +0000 (11:37 -0200)
commit4b0b2f088f12e2ada1297502d7bebde182cf65b0
treec3f5bdb06a047eaca8a2e09b6dfd285d0cc26037
parent4dad99928211a20a91ec4515ab3b53fd65988f34
parentd7660918fce210f421cc58c060ca3de71e4ffd37
Merge git://git./linux/kernel/git/padovan/bluetooth

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