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-17 14:08:47 -04:00

parent 740bb82b76 92d1372e1a

commit 7f4dbaa3ae

6 changed files with 85 additions and 65 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

7

net/bluetooth/hci_conn.c

View file

17

net/bluetooth/hci_event.c

View file

8

net/bluetooth/l2cap_core.c

View file

5

net/bluetooth/l2cap_sock.c

View file

104

net/bluetooth/mgmt.c

View file

9

net/bluetooth/smp.c

View file