]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Nov 2011 00:47:15 +0000 (11:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Nov 2011 00:47:15 +0000 (11:47 +1100)
commit86ae1a82e10965b3b1445ae907fc87c0994e5cac
treed16fdd7f3ba9412a917ac3173f118e7177f5f03b
parent8c4ff95c9f71b25b9d51dcf972237a36482780db
parent1e92e0b03905de28616d53c8b8c654defb16a096
Merge remote-tracking branch 'bluetooth/master'

Conflicts:
include/net/bluetooth/bluetooth.h
net/bluetooth/l2cap_sock.c
drivers/bluetooth/btusb.c
include/net/bluetooth/bluetooth.h
net/bluetooth/l2cap_sock.c
net/bluetooth/rfcomm/sock.c