Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-19 18:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
22f10923dd
linux/drivers/net/ethernet/amd
History
David S. Miller 22f10923dd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/amd/xgbe/xgbe-desc.c
	drivers/net/ethernet/renesas/sh_eth.c

Overlapping changes in both conflict cases.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-12-10 15:48:20 -05:00
..
xgbe Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-12-10 15:48:20 -05:00
7990.c lance: Call dev_consume_skb_any instead of dev_kfree_skb. 2014-03-24 21:18:53 -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 drivers/net: fix up stale paths from driver reorg 2012-01-30 12:54:40 -05:00
amd8111e.c ethernet: amd: fix 'foo* bar' 2014-07-14 19:14:15 -07:00
amd8111e.h net: amd8111e: Spelling s/recive/receive/ 2014-01-14 17:11:25 -08:00
ariadne.c net/ariadne: delete unneeded call to netdev_priv 2014-05-15 16:57:47 -04:00
ariadne.h
atarilance.c net:drivers/net: Miscellaneous conversions to ETH_ALEN 2013-10-02 17:04:45 -04:00
au1000_eth.c ethernet: amd: use pr_info_once() 2014-09-12 18:02:41 -04: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 amd-xgbe: Let AMD_XGBE depend on HAS_IOMEM 2014-11-05 21:50:13 -05: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 am2150: Update nmclan_cs.c to use update PCMCIA API 2014-09-22 14:27:44 -04:00
pcnet32.c PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
sun3lance.c ethernet: amd: remove deprecated IRQF_DISABLED 2013-09-12 23:27:09 -04:00
sunlance.c drivers/net: delete non-required instances of include <linux/init.h> 2014-01-16 11:53:26 -08:00