diff options
| author | David S. Miller <davem@davemloft.net> | 2016-07-20 23:42:28 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-20 23:42:28 +0200 |
| commit | 4599f772e7d94a25b0ecad203cdeabf1744b219c (patch) | |
| tree | 3df0e34ca6cdcad7dceb4b38c9650fd093bf2247 /drivers/net/ethernet | |
| parent | bpf, elf: add official ELF machine define for eBPF (diff) | |
| parent | Bluetooth: btmrvl: reset is_suspending flag in failure path (diff) | |
| download | linux-4599f772e7d94a25b0ecad203cdeabf1744b219c.tar.xz linux-4599f772e7d94a25b0ecad203cdeabf1744b219c.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2016-07-19
Here's likely the last bluetooth-next pull request for the 4.8 kernel:
- Fix for L2CAP setsockopt
- Fix for is_suspending flag handling in btmrvl driver
- Addition of Bluetooth HW & FW info fields to debugfs
- Fix to use int instead of char for callback status.
The last one (from Geert Uytterhoeven) is actually not purely a
Bluetooth (or 802.15.4) patch, but it was agreed with other maintainers
that we take it through the bluetooth-next tree.
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
0 files changed, 0 insertions, 0 deletions