Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

Browse source

...

This commit is contained in:

John W. Linville 2014-06-25 14:22:35 -04:00

parent dc70a292da 48439d501e

commit 8b87efba61

5 changed files with 58 additions and 18 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/bluetooth/ath3k.c

View file

1

drivers/bluetooth/btusb.c

View file

1

drivers/bluetooth/hci_h5.c

View file

12

net/bluetooth/hci_conn.c

View file

60

net/bluetooth/smp.c

View file