David S. Miller 71a83a6db6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/rocker/rocker.c The rocker commit was two overlapping changes, one to rename the ->vport member to ->pport, and another making the bitmask expression use '1ULL' instead of plain '1'. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-03 21:16:48 -05:00
..
cassini.c	net: cassini: Deletion of an unnecessary check before the function call "vfree"	2014-12-05 21:14:19 -08:00
cassini.h	ethernet: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
Kconfig	Merge branch 'akpm' (incoming from Andrew)	2013-02-21 17:38:49 -08:00
Makefile
niu.c	niu: fix error handling in niu_class_to_ethflow()	2015-02-28 12:58:25 -05:00
niu.h
sunbmac.c	net: ethernet: sun: drop owner assignment from platform_drivers	2014-10-20 16:21:13 +02:00
sunbmac.h
sungem.c	sungem: Fix global namespace pollution of phy accessors.	2014-08-27 23:07:12 -07:00
sungem.h
sunhme.c	Driver core patches for 3.19-rc1	2014-12-14 16:10:09 -08:00
sunhme.h	sunhme: stop using net_device.{base_addr, irq}.	2012-04-07 11:47:03 +02:00
sunqe.c	net: ethernet: sun: drop owner assignment from platform_drivers	2014-10-20 16:21:13 +02:00
sunqe.h
sunvnet.c	sunvnet: failed trigger should not cause BUG_ON()	2015-02-20 17:44:24 -05:00
sunvnet.h	sunvnet: add TSO support	2014-12-08 21:19:04 -05:00