David S. Miller 909b27f706 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The nf_conntrack_core.c fix in 'net' is not relevant in 'net-next' because we no longer have a per-netns conntrack hash. The ip_gre.c conflict as well as the iwlwifi ones were cases of overlapping changes. Conflicts: drivers/net/wireless/intel/iwlwifi/mvm/tx.c net/ipv4/ip_gre.c net/netfilter/nf_conntrack_core.c Signed-off-by: David S. Miller <davem@davemloft.net>		2016-05-15 13:32:48 -04:00
..
Kconfig	net: xgene_enet: Set hardware dependency	2015-05-09 16:24:15 -04:00
Makefile	drivers: net: xgene: Add support for Classifier engine	2016-02-17 22:08:34 -05:00
xgene_enet_cle.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-15 13:32:48 -04:00
xgene_enet_cle.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-15 13:32:48 -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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-15 13:32:48 -04:00
xgene_enet_hw.h	drivers: net: xgene: fix register offset	2016-05-13 21:12:07 -04:00
xgene_enet_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-15 13:32:48 -04:00
xgene_enet_main.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-15 13:32:48 -04:00
xgene_enet_ring2.c	drivers: net: xgene: Add support for multiple queues	2016-02-17 22:08:34 -05: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: fix register offset	2016-05-13 21:12:07 -04: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