diff options
| author | David S. Miller <davem@davemloft.net> | 2018-05-07 11:38:37 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-07 11:38:37 -0400 |
| commit | d2fcd01335ac7e022c2e45d03e815129322519fa (patch) | |
| tree | 3cbc26ec873e6f8d5cca41b0004812084998175e /drivers/net/wan/Kconfig | |
| parent | 2ba5622fba85eb52c91bf49c355ce1e36991a701 (diff) | |
| parent | 596b07a9a22656493726edf1739569102bd3e136 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Johan Hedberg says:
====================
pull request: bluetooth 2018-05-07
Here are a few more Bluetooth fixes for the 4.17 kernel, all for the
btusb driver. Two relate to the needs_reset_resume table, and one is a
revert of a patch for Atheros 1525/QCA6174 which caused a regression for
some people.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wan/Kconfig')
0 files changed, 0 insertions, 0 deletions