diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-26 00:32:28 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-26 00:32:28 +0300 |
| commit | 525d0ae7a2ee1b70f09936dbac56b0d4920fa005 (patch) | |
| tree | 684d4e6657b54d7279826eff9b6088e4ba0e16ef /drivers/net/ethernet/emulex/benet/be_main.c | |
| parent | d9ac2d99787d08c0e3f777dac5aeaa3fed61b692 (diff) | |
| parent | fbbe83c52bc0d52398de72d7df1857cc9b36244e (diff) | |
| download | linux-525d0ae7a2ee1b70f09936dbac56b0d4920fa005.tar.xz | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2018-01-25
Here's one last bluetooth-next pull request for the 4.16 kernel:
- Improved support for Intel controllers
- New set_parity method to serdev (agreed with maintainers to be taken
through bluetooth-next)
- Fix error path in hci_bcm (missing call to serdev close)
- New ID for BCM4343A0 UART controller
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/emulex/benet/be_main.c')
0 files changed, 0 insertions, 0 deletions