David S. Miller 4366004d77 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/intel/igb/e1000_mac.c
	net/core/filter.c

Both conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2014-04-24 13:19:00 -04:00

..

sxgbe

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-04-24 13:19:00 -04:00

Kconfig

sxgbe: use common NET_VENDOR_FOO style.

2014-04-03 14:36:27 -04:00

Makefile

net: sxgbe: add basic framework for Samsung 10Gb ethernet driver

2014-03-26 16:49:31 -04:00