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_pci_bridge.c
bridge_pcmcia_80211.c	ssb: pick PCMCIA host code support from b43 driver	2015-10-28 21:04:04 +02:00
driver_chipcommon_pmu.c
driver_chipcommon_sflash.c
driver_chipcommon.c
driver_extif.c
driver_gige.c
driver_gpio.c	SSB: Change bare unsigned to unsigned int to suit coding style	2016-07-06 15:09:36 +02:00
driver_mipscore.c
driver_pcicore.c
embedded.c
host_soc.c	ssb: pick SoC invariants code from MIPS BCM47xx arch	2015-12-16 16:36:25 +02:00
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-19 22:59:33 -05:00
main.c	ssb: Delete an error message for a failed memory allocation in ssb_devices_register()	2017-05-24 16:46:51 +03:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
pci.c	ssb: Fix error routine when fallback SPROM fails	2016-11-17 08:49:04 +02:00
pcihost_wrapper.c
pcmcia.c	ssb: make ssb_pcmcia_switch_core static	2015-09-29 11:03:14 +03:00
scan.c
sdio.c
sprom.c
ssb_private.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00