]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Oct 2011 03:16:26 +0000 (14:16 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Oct 2011 03:16:26 +0000 (14:16 +1100)
commitc595820bd129b90aa81bcef36945b46143c3fa94
tree310aca06dcdf7a212425fbc8178229aff1575120
parentbcbfd1cd4098c5c8406993e251bfa8b710f6ee52
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