]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 02:48:57 +0000 (12:48 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 02:48:57 +0000 (12:48 +1000)
commit1205167ecbd47604409018c50e01bfbe0a700489
treee6b8b9752290bbfe1a156af8a71a0c92e21735e4
parente77e5bb957d36d4d20daeeda95bf7f8b652e67b8
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