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

Browse source

...

This commit is contained in:

John W. Linville 2014-09-15 14:55:45 -04:00

parent 6bd2bd27ba 9a783a139c

commit 1186b623c2

5 changed files with 75 additions and 55 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

1

net/bluetooth/hci_core.c

View file

11

net/bluetooth/hci_event.c

View file

55

net/bluetooth/l2cap_core.c

View file

59

net/bluetooth/smp.c

View file

8

net/bluetooth/smp.h

View file