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-04-25 08:57:17 -04:00

parent ffa216bb5e 1fb4e09a7e

commit 38f3106a9b

4 changed files with 16 additions and 6 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

5

drivers/bluetooth/btusb.c

View file

9

net/bluetooth/hci_conn.c

View file

6

net/bluetooth/hci_event.c

View file