linux_dsm_epyc7002/drivers/net/ethernet/neterion
David S. Miller 95f873f2ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	arch/arm/boot/dts/imx6sx-sdb.dts
	net/sched/cls_bpf.c

Two simple sets of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 16:59:56 -08:00
..
vxge net: rename vlan_tx_* helpers since "tx" is misleading there 2015-01-13 17:51:08 -05:00
Kconfig net: Remove bogus dependencies on INET 2012-11-19 19:13:59 -05:00
Makefile s2io/vxge: Move the Exar drivers 2011-08-11 02:41:47 -07:00
s2io-regs.h s2io/vxge: Move the Exar drivers 2011-08-11 02:41:47 -07:00
s2io.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-01-27 16:59:56 -08:00
s2io.h drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00