David S. Miller f188b951f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/renesas/ravb_main.c kernel/bpf/syscall.c net/ipv4/ipmr.c All three conflicts were cases of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-12-03 21:09:12 -05:00
..
xgbe	net: move skb_mark_napi_id() into core networking stack	2015-11-18 16:17:41 -05:00
7990.c	net: 7990: Export lance_poll() to modules	2015-09-29 21:11:12 -07:00
7990.h	net/7990: Make lance_private.name const	2013-12-29 00:46:38 -05:00
a2065.c	zorro/UAPI: Use proper types (endianness/size) in <linux/zorro.h>	2013-11-26 11:09:09 +01:00
a2065.h
am79c961a.c	am79c961a: Call dev_consume_skb_any instead of dev_kfree_skb.	2014-03-24 21:18:40 -07:00
am79c961a.h
amd8111e.c	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
amd8111e.h	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
ariadne.c	net/ariadne: delete unneeded call to netdev_priv	2014-05-15 16:57:47 -04:00
ariadne.h
atarilance.c	net: atarilance: Remove obsolete IRQ_TYPE_PRIO	2015-01-15 13:44:50 +01:00
au1000_eth.c	drivers/net: get rid of unnecessary initializations in .get_drvinfo()	2015-10-16 00:24:10 -07:00
au1000_eth.h	ethernet: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
declance.c	declance: Fix 64-bit compilation warnings	2014-07-08 14:04:30 -07:00
hplance.c	hplance: fix ram size in comment	2014-06-05 15:14:21 -07:00
hplance.h
Kconfig	net: hplance: Allow modular build	2015-09-29 21:11:13 -07:00
lance.c	lance: Fix hardcoded interrupt name lp->name to use system device value	2013-09-27 17:38:32 -04:00
Makefile	amd-xgbe: Configuration and build support	2014-06-05 15:26:51 -07:00
mvme147.c	mvme147: fix ram size in comment	2014-06-05 15:14:21 -07:00
ni65.c	PTR_RET is now PTR_ERR_OR_ZERO(): Replace most.	2013-07-15 11:25:01 +09:30
ni65.h
nmclan_cs.c	net: am2150: fix nmclan_cs.c shared interrupt handling	2015-01-29 15:08:21 -08:00
pcnet32.c	various: fix pci_set_dma_mask return value checking	2015-11-20 16:17:32 -08:00
sun3lance.c	ethernet: amd: remove deprecated IRQF_DISABLED	2013-09-12 23:27:09 -04:00
sunlance.c	net: ethernet: amd: drop owner assignment from platform_drivers	2014-10-20 16:21:04 +02:00