]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 9 Nov 2011 00:49:45 +0000 (11:49 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 9 Nov 2011 00:49:45 +0000 (11:49 +1100)
commit746ab019308efd77f89ce74d8371277503de0cb7
treecf8ce4d5dcfb2db54d27d2e3df277889b309dc41
parent5954516462746dbea291951e5683e852d017eb9b
parent4c659c3976e81f9def48993cd00988d53d7379f2
Merge remote-tracking branch 'bluetooth/master'

Conflicts:
include/net/bluetooth/bluetooth.h
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c
drivers/bluetooth/btusb.c
include/net/bluetooth/bluetooth.h
include/net/bluetooth/hci_core.h
include/net/bluetooth/l2cap.h
net/bluetooth/hci_conn.c
net/bluetooth/hci_sysfs.c
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c
net/bluetooth/rfcomm/sock.c