David S. Miller c85d6975ef Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mellanox/mlx4/cmd.c net/core/fib_rules.c net/ipv4/fib_frontend.c The fib_rules.c and fib_frontend.c conflicts were locking adjustments in 'net' overlapping addition and removal of code in 'net-next'. The mlx4 conflict was a bug fix in 'net' happening in the same place a constant was being replaced with a more suitable macro. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-04-06 22:34:15 -04:00
..
Kconfig	net: pxa168_eth: PXA168_ETH should depend on HAS_DMA	2014-10-10 14:45:01 -04:00
Makefile	ethernet: Add new driver for Marvell Armada 375 network unit	2014-07-10 17:18:24 -07:00
mv643xx_eth.c	net: mv643xx_eth: Fix highmem support in non-TSO egress path	2015-01-26 16:14:40 -08:00
mvmdio.c	net: mvmdio: Use devm_* API to simplify the code	2014-05-23 15:31:49 -04:00
mvneta.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-06 22:34:15 -04:00
mvpp2.c	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
pxa168_eth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-12-10 15:48:20 -05:00
skge.c	skge: Unmask interrupts in case of spurious interrupts	2014-12-05 21:33:19 -08:00
skge.h
sky2.c	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
sky2.h	sky2: Receive Overflows not counted	2013-03-29 14:53:19 -04:00