openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/net/ethernet/amd
History
David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/phy/bcm7xxx.c
	drivers/net/phy/marvell.c
	drivers/net/vxlan.c

All three conflicts were cases of simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2016-02-23 00:09:14 -05:00
..
xgbe amd-xgbe: Mask auto-negotiation interrupts in ISR 2016-02-17 15:22:20 -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
Kconfig net: hplance: Allow modular build 2015-09-29 21:11:13 -07:00
Makefile amd-xgbe: Configuration and build support 2014-06-05 15:26:51 -07: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 net: am79c961a: avoid %? in inline assembly 2016-02-16 15:06:54 -05: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 ethernet: amd: au1000: Remove pointless warning 2016-01-10 22:06:59 -05: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
…
lance.c lance: Return correct error code 2016-02-18 14:58:47 -05: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