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
..
brcmfmac	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
brcmsmac	brcmsmac: make function wlc_phy_workarounds_nphy_rev1 static	2018-06-27 18:57:23 +03:00
brcmutil	brcmutil: add field storing control channel to the struct brcmu_chan	2016-06-14 17:27:42 +03:00
include	brcmfmac: add support for BCM4366E chipset	2018-04-25 11:21:58 +03:00
Kconfig	net: Remove depends on HAS_DMA in case of platform dependency	2018-06-23 10:44:30 +09:00
Makefile	…