OpenCloudOS-Kernel/drivers/net/ethernet/marvell
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: mvneta: bm: fix dependencies again 2016-05-12 16:56:30 -04:00
Makefile net: mvneta: bm: add support for hardware buffer management 2016-03-14 12:19:46 -04:00
mv643xx_eth.c net: mv643xx_eth: fix packet corruption with TSO and tiny unaligned packets. 2016-01-28 16:08:01 -08:00
mvmdio.c mdio: Move allocation of interrupts into core 2016-01-07 14:31:26 -05:00
mvneta.c net: mvneta: Remove superfluous SMP function call 2016-05-03 15:27:18 -04:00
mvneta_bm.c net: mvneta: Use the new hwbm framework 2016-03-14 12:19:47 -04:00
mvneta_bm.h net: mvneta: Use the new hwbm framework 2016-03-14 12:19:47 -04:00
mvpp2.c net: mvpp2: use cache_line_size() to get cacheline size 2016-04-01 14:36:47 -04:00
pxa168_eth.c pxa168_eth: mdiobus_scan() doesn't return NULL anymore 2016-05-09 00:13:18 -04:00
skge.c skge: Unmask interrupts in case of spurious interrupts 2014-12-05 21:33:19 -08:00
skge.h
sky2.c treewide: replace dev->trans_start update with helper 2016-05-04 14:16:49 -04:00
sky2.h sky2: Receive Overflows not counted 2013-03-29 14:53:19 -04:00