]> 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)
commit2a4fac881a623a364b34b9681df0836b52919462
tree8d12460ba978d4f031715ae4bd9e0bc6fee4c5ab
parentdbe4c75e252facfb823db72357a26d74707b17df
parent2f0e87856507f163d419e07256f37eb82e74078d
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