]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 02:50:54 +0000 (12:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 02:50:54 +0000 (12:50 +1000)
commit073961da26ffef682ba4d08706b86a56fb854ade
tree4397923bed95a03cc47e9ca6baf814ba3a1d19af
parent8e07da89c8ac8bf5793e254d80227665e978317a
parentcd60aab8566db1ed1040e3b92402662b455e67e1
Merge remote-tracking branch 'bluetooth/master'

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