leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a23113b5f6
linux/drivers/net/ethernet/apm/xgene
History
David S. Miller b3e0d3d7ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/geneve.c

Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-17 22:08:28 -05:00
..
Kconfig net: xgene_enet: Set hardware dependency 2015-05-09 16:24:15 -04:00
Makefile drivers: net: xgene: Add ring manager v2 functions 2015-04-30 16:03:13 -04:00
xgene_enet_ethtool.c drivers: net: xgene: Add SGMII based 1GbE ethtool support 2014-10-14 16:09:22 -04:00
xgene_enet_hw.c drivers: net: xgene: constify xgene_mac_ops and xgene_port_ops structures 2015-12-08 21:39:32 -05:00
xgene_enet_hw.h drivers: net: xgene: constify xgene_mac_ops and xgene_port_ops structures 2015-12-08 21:39:32 -05:00
xgene_enet_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-12-17 22:08:28 -05:00
xgene_enet_main.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-12-17 22:08:28 -05:00
xgene_enet_ring2.c drivers: net: xgene: Add ring manager v2 functions 2015-04-30 16:03:13 -04:00
xgene_enet_ring2.h drivers: net: xgene: Add ring manager v2 functions 2015-04-30 16:03:13 -04:00
xgene_enet_sgmac.c drivers: net: xgene: constify xgene_mac_ops and xgene_port_ops structures 2015-12-08 21:39:32 -05:00
xgene_enet_sgmac.h drivers: net: xgene: constify xgene_mac_ops and xgene_port_ops structures 2015-12-08 21:39:32 -05:00
xgene_enet_xgmac.c drivers: net: xgene: constify xgene_mac_ops and xgene_port_ops structures 2015-12-08 21:39:32 -05:00
xgene_enet_xgmac.h drivers: net: xgene: constify xgene_mac_ops and xgene_port_ops structures 2015-12-08 21:39:32 -05:00