linux/drivers/net/ethernet/xilinx
David S. Miller 4963ed48f2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	net/ipv4/arp.c

The net/ipv4/arp.c conflict was one commit adding a new
local variable while another commit was deleting one.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-26 16:08:27 -07:00
..
Kconfig drivers/net: remove all references to obsolete Ethernet-HOWTO 2015-06-23 06:50:35 -07:00
ll_temac_main.c net: ll_temac: Remove sparse warnings 2015-06-07 15:20:42 -07:00
ll_temac_mdio.c net: ll_temac: Use of_property_read_u32 instead of open-coding it 2015-09-24 14:30:00 -07:00
ll_temac.h
Makefile
xilinx_axienet_main.c net: axienet: Fix devm_ioremap_resource return value check 2015-07-09 21:43:16 -07:00
xilinx_axienet_mdio.c net: axinet: Use of_property_read_u32 instead of open-coding it 2015-09-24 14:30:00 -07:00
xilinx_axienet.h net: axienet: Fix kernel-doc warnings 2015-05-05 19:34:01 -04:00
xilinx_emaclite.c net: fix phy refcounting in a bunch of drivers 2015-09-24 23:04:53 -07:00