]> git.baikalelectronics.ru Git - kernel.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
authorGustavo F. Padovan <padovan@profusion.mobi>
Thu, 9 Jun 2011 19:33:54 +0000 (16:33 -0300)
committerGustavo F. Padovan <padovan@profusion.mobi>
Thu, 9 Jun 2011 19:33:54 +0000 (16:33 -0300)
commit24910c17a4d9136098045cf5a8ead6e5b318ab5d
tree8d12460ba978d4f031715ae4bd9e0bc6fee4c5ab
parentfca094e0343cef474ba7895c1fb61f9947474529
parentdbe01f9e580e9e18af9f74ec715db0e32949d4c7
Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6

Conflicts:
net/bluetooth/rfcomm/sock.c
net/bluetooth/hci_event.c
net/bluetooth/l2cap_sock.c
net/bluetooth/rfcomm/sock.c