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

ssb: add PCI ID 0x4351

2014-08-25 15:39:22 -04:00

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

SSB: Fix handling of ssb_pmu_get_alp_clock()

2015-06-09 16:38:06 +02:00

driver_chipcommon_sflash.c

ssb: fix sparse warnings in driver_chipcommon_sflash.c

2014-01-03 15:37:01 -05:00

driver_chipcommon.c

ssb: Convert ssb_printk to ssb_<level>

2013-03-06 16:24:23 -05:00

driver_extif.c

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2012-12-14 14:27:45 -08:00

driver_gige.c

treewide: Remove unnecessary SSB_DEVTABLE_END macro

2015-02-11 14:38:29 -08:00

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

MIPS: BCM47xx: Move NVRAM header to the include/linux/.

2015-04-01 17:22:00 +02:00

driver_pcicore.c

ssb: extend fix for PCI related silent reboots to all chipsets

2015-05-20 16:36:06 +03:00

embedded.c

ssb: Convert ssb_printk to ssb_<level>

2013-03-06 16:24:23 -05:00

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

SSB / B44: fix WOL for BCM4401

2014-12-04 11:32:46 -05:00

pcmcia.c

ssb: make ssb_pcmcia_switch_core static

2015-09-29 11:03:14 +03:00

scan.c

ssb: Convert ssb_printk to ssb_<level>

2013-03-06 16:24:23 -05:00

sdio.c

ssb: make ssb_sdio_switch_core static

2015-09-29 11:00:58 +03:00

sprom.c

ssb: sprom: replace strict_strtoul() with kstrtoul()

2013-06-03 00:39:46 -07:00

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