korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-29 22:14:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
e25d00b87b
linux/drivers/net/ethernet/cavium
History
David S. Miller 5510b3c2a1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	arch/s390/net/bpf_jit_comp.c
	drivers/net/ethernet/ti/netcp_ethss.c
	net/bridge/br_multicast.c
	net/ipv4/ip_fragment.c

All four conflicts were cases of simple overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-07-31 23:52:20 -07:00
..
liquidio net-Liquidio: Delete unnecessary checks before the function call "vfree" 2015-06-29 09:28:14 -07:00
thunder net: thunderx: Fix for crash while BGX teardown 2015-07-29 23:52:32 -07:00
Kconfig net: thunderx: Select CONFIG_MDIO_OCTEON for ThunderX NIC 2015-07-29 17:17:44 -07:00
Makefile Add support of Cavium Liquidio ethernet adapters 2015-06-10 22:44:08 -07:00