]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 02:37:22 +0000 (13:37 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 02:37:22 +0000 (13:37 +1100)
commit65760ea44b7e0276ca0b78838bbf3f72c6ee3418
tree03aaf85dc072a9333bd7965575a63a19ed0246b9
parent8901680fbdb90c72948e8c01cb923f9537126482
parent8920047889584998d9e13bcbbc6300bb4f5a8484
Merge remote-tracking branch 'bluetooth/master'

Conflicts:
net/bluetooth/hci_core.c
net/bluetooth/l2cap_core.c
net/bluetooth/mgmt.c
net/bluetooth/smp.c
drivers/bluetooth/btusb.c
include/net/bluetooth/l2cap.h
net/bluetooth/hci_conn.c
net/bluetooth/hidp/core.c
net/bluetooth/l2cap_core.c