David S. Miller 1f6d80358d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/mips/net/bpf_jit.c drivers/net/can/flexcan.c Both the flexcan and MIPS bpf_jit conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-09-23 12:09:27 -04:00
..
emac_arc.c	ethernet: arc: Add support for specific SoC layer device tree bindings	2014-08-27 16:40:26 -07:00
emac_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-09-23 12:09:27 -04:00
emac_mdio.c	ethernet: arc: mdio changes for future SoC glue layer devtree support	2014-08-27 16:40:26 -07:00
emac_rockchip.c	net: ethernet: arc: Don't free Rockchip resources before disconnect from phy	2014-09-10 13:03:00 -07:00
emac.h	ethernet: arc: Add support for Rockchip SoC layer device tree bindings	2014-09-09 17:29:59 -07:00
Kconfig	ethernet: arc: Add support for Rockchip SoC layer device tree bindings	2014-09-09 17:29:59 -07:00
Makefile	ethernet: arc: Add support for Rockchip SoC layer device tree bindings	2014-09-09 17:29:59 -07:00