David S. Miller 8565d26bcb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The BPF verifier conflict was some minor contextual issue. The TUN conflict was less trivial. Cong Wang fixed a memory leak of tfile->tx_array in 'net'. This is an skb_array. But meanwhile in net-next tun changed tfile->tx_arry into tfile->tx_ring which is a ptr_ring. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-01-19 22:59:33 -05:00
..
b43	b43: Replace mdelay with usleep_range in b43_radio_2057_init_post	2018-01-11 21:54:01 +02:00
b43legacy	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
brcm80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-19 22:59:33 -05:00
Kconfig	brcm80211: move under broadcom vendor directory	2015-11-18 11:24:22 +02:00
Makefile	brcm80211: move under broadcom vendor directory	2015-11-18 11:24:22 +02:00