]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 02:21:30 +0000 (12:21 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 02:21:30 +0000 (12:21 +1000)
commit2c0110f8079cf8c01b7615c24fb6d5c4230b3ae0
treebaa47e1b6313950d481c8fa5fe16947c42df7751
parent350531f6c636c1159db4bac0baf8856f6caa8d28
parent5a134faeef82b46ff4ad244d11d8c6be41679834
Merge remote-tracking branch 'bluetooth/master'

Conflicts:
drivers/bluetooth/btusb.c
drivers/bluetooth/btusb.c
net/bluetooth/hci_conn.c
net/bluetooth/hci_event.c
net/bluetooth/rfcomm/core.c