summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e100.c
diff options
context:
space:
mode:
authorDavid S. Miller2018-05-21 00:24:22 +0200
committerDavid S. Miller2018-05-21 00:24:22 +0200
commit2c71ab4bb465c79a4687cc2fd5012e470aebdb1f (patch)
treebe9407da61256ff3cc17219f2f8acc45297bfdd0 /drivers/net/ethernet/intel/e100.c
parentRevert "ixgbe: release lock for the duration of ixgbe_suspend_close()" (diff)
parentBluetooth: Add a new 13d3:3496 QCA_ROME device (diff)
downloadkernel-qcow2-linux-2c71ab4bb465c79a4687cc2fd5012e470aebdb1f.tar.gz
kernel-qcow2-linux-2c71ab4bb465c79a4687cc2fd5012e470aebdb1f.tar.xz
kernel-qcow2-linux-2c71ab4bb465c79a4687cc2fd5012e470aebdb1f.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 2018-05-18 Here's the first bluetooth-next pull request for the 4.18 kernel: - Refactoring of the btbcm driver - New USB IDs for QCA_ROME and LiteOn controllers - Buffer overflow fix if the controller sends invalid advertising data length - Various cleanups & fixes for Qualcomm controllers 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/intel/e100.c')
0 files changed, 0 insertions, 0 deletions