David S. Miller 30d0844bdc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mellanox/mlx5/core/en.h drivers/net/ethernet/mellanox/mlx5/core/en_main.c drivers/net/usb/r8152.c All three conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-07-06 10:35:22 -07: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_bm.c	net: mvneta: Fix lacking spinlock initialization	2016-05-25 12:35:08 -07:00
mvneta_bm.h	net: mvneta: Use the new hwbm framework	2016-03-14 12:19:47 -04:00
mvneta.c	net: mvneta: fix open() error cleanup	2016-07-01 05:59:39 -04:00
mvpp2.c	net: ethernet: mvpp2: use phy_ethtool_{get|set}_link_ksettings	2016-06-29 06:03:39 -04:00
pxa168_eth.c	net: pxa168_eth: Use dma_wmb/rmb where appropriate	2016-05-16 13:39:49 -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