alistair23-linux/drivers/net/ethernet/samsung/sxgbe
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
..
Makefile
sxgbe_common.h net: sxgbe: Added rxqueue enable function 2014-04-30 16:12:22 -04:00
sxgbe_core.c net: sxgbe: Added rxqueue enable function 2014-04-30 16:12:22 -04:00
sxgbe_desc.c net: sxgbe: Added set function for interrupt on complete 2014-04-30 16:12:22 -04:00
sxgbe_desc.h net: sxgbe: Added set function for interrupt on complete 2014-04-30 16:12:22 -04:00
sxgbe_dma.c
sxgbe_dma.h
sxgbe_ethtool.c net: get rid of SET_ETHTOOL_OPS 2014-05-13 17:43:20 -04:00
sxgbe_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-01-27 16:59:56 -08:00
sxgbe_mdio.c
sxgbe_mtl.c
sxgbe_mtl.h
sxgbe_platform.c net: sxgbe: Fix NULL dereferece when using DT 2015-01-15 19:01:10 -05:00
sxgbe_reg.h net: sxgbe: remove duplicate SXGBE_CORE_L34_ADDCTL_REG define 2014-06-11 15:01:30 -07:00
sxgbe_xpcs.c
sxgbe_xpcs.h