]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit745be3b2b62af5c1ef06bc01ea7f4e8f8603e0fe
treec3f5bdb06a047eaca8a2e09b6dfd285d0cc26037
parent584db1712a5e12ea80328bf5be1a6610726ddbbf
parent372bb5c1b1e30e46ee1bb8a0b3bee11f3ec62877
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