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)
commit3f4224b9caf015359be7498f7bb66c973ad10b27
treec3f5bdb06a047eaca8a2e09b6dfd285d0cc26037
parent3ba5e1eecbafc44890b31c800d63a909d6d2fe0d
parent10929a6cd783a81436d14fe3b6e3dbb59b6373cf
MergeĀ git://git.kernel.org/pub/scm/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