David S. Miller 8fd90bb889 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/infiniband/hw/cxgb4/device.c The cxgb4 conflict was simply overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-07-22 00:44:59 -07:00
..
cassini.c	net: cassini: use nested lock annotation	2014-05-09 16:34:10 -04: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: remove unnecessary break after return	2014-07-20 21:30:18 -07:00
niu.h
sunbmac.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
sunbmac.h
sungem.c	sungem: Call dev_consume_skb_any instead of dev_kfree_skb.	2014-03-24 21:19:12 -07:00
sungem.h
sunhme.c	net: sunhme: remove unnecessary pci_set_drvdata()	2013-10-22 02:11:53 -04:00
sunhme.h	sunhme: stop using net_device.{base_addr, irq}.	2012-04-07 11:47:03 +02:00
sunqe.c	net:drivers/net: Miscellaneous conversions to ETH_ALEN	2013-10-02 17:04:45 -04:00
sunqe.h
sunvnet.c	sunvnet: clean up objects created in vnet_new() on vnet_exit()	2014-07-16 22:44:07 -07:00
sunvnet.h