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-10-02 13:56:19 -04:00

parent 574a7930d7 9c238ca8ec

commit f6cd071891

5 changed files with 139 additions and 63 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

4

drivers/bluetooth/Kconfig

View file

36

drivers/bluetooth/btmrvl_sdio.c

View file

4

drivers/bluetooth/btusb.c

View file

151

net/bluetooth/6lowpan.c

View file

13

net/bluetooth/l2cap_core.c

View file