]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 03:47:50 +0000 (14:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 03:47:50 +0000 (14:47 +1100)
commitca607ffe4825dedad9dffb67a25a7858c2751201
treedcf476fdc44a4ddf1da95fe8bb9d055ba71576dc
parent97c2b48879f51ef9c666f8c213846a8f946f6f94
parent693ff2d50de41489bf641e82b6ee3e39b0b3fdc3
Merge remote-tracking branch 'bluetooth/master'

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