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 2013-02-01 14:21:56 -05:00

parent e56b04efc1 a3d0935649

commit 5d38745fa8

5 changed files with 150 additions and 102 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

include/net/bluetooth/hci_core.h

View file

10

net/bluetooth/hci_core.c

View file

4

net/bluetooth/hci_event.c

View file

221

net/bluetooth/mgmt.c

View file

18

net/bluetooth/sco.c

View file