David S. Miller 9d367eddf3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/bonding/bond_main.c drivers/net/ethernet/mellanox/mlxsw/spectrum.h drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c The bond_main.c and mellanox switch conflicts were cases of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-01-11 23:55:43 -05:00
..
Kconfig	drivers/net: remove all references to obsolete Ethernet-HOWTO	2015-06-23 06:50:35 -07:00
Makefile
ravb_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-01-11 23:55:43 -05:00
ravb_ptp.c	renesas: missing unlock on error path	2015-06-25 02:13:02 -07:00
ravb.h	ravb: ptp: Add CONFIG mode support	2015-12-03 14:28:26 -05:00
sh_eth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-01-11 23:55:43 -05:00
sh_eth.h	sh_eth: remove EDMAC_BIG_ENDIAN	2016-01-04 16:11:11 -05:00