David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... The BTF conflicts were simple overlapping changes. The virtio_net conflict was an overlap of a fix of statistics counter, happening alongisde a move over to a bonafide statistics structure rather than counting value on the stack. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-08-02 10:55:32 -07:00
..
core	Revert "staging:r8188eu: Use lib80211 to support TKIP"	2018-07-16 10:04:11 +02:00
hal	Staging:rtl888eu:include Fix CamelCase issue	2018-05-31 19:04:39 +02:00
include	ieee80211: bump IEEE80211_MAX_AMPDU_BUF to support HE	2018-06-18 22:39:39 +02:00
os_dep	net: allow ndo_select_queue to pass netdev	2018-07-09 13:41:34 -07:00
Kconfig	Revert "staging:r8188eu: Use lib80211 to support TKIP"	2018-07-16 10:04:11 +02:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
TODO	staging:r8188eu: Remove rx_handler_data unnecessary read	2018-05-11 11:48:24 +02:00