David S. Miller 4fbef95af4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be.h drivers/net/usb/qmi_wwan.c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h include/net/netfilter/nf_conntrack_synproxy.h include/net/secure_seq.h The conflicts are of two varieties: 1) Conflicts with Joe Perches's 'extern' removal from header file function declarations. Usually it's an argument signature change or a function being added/removed. The resolutions are trivial. 2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds a new value, another changes an existing value. That sort of thing. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-10-01 17:06:14 -04:00
..
Kconfig	net: emaclite: Enable emaclite for Xilinx Arm Zynq platform	2013-05-30 17:08:43 -07:00
ll_temac_main.c	ll_temac: Reset dma descriptors indexes on ndo_open	2013-10-01 12:31:35 -04:00
ll_temac_mdio.c
ll_temac.h
Makefile	drivers/net/ethernet/xilinx: added Xilinx AXI Ethernet driver	2012-01-25 16:59:47 -05:00
xilinx_axienet_main.c	drivers:net: Convert dma_alloc_coherent(...__GFP_ZERO) to dma_zalloc_coherent	2013-08-29 21:55:23 -04:00
xilinx_axienet_mdio.c	net: xilinx: fix memleak	2013-08-28 18:24:31 -04:00
xilinx_axienet.h	drivers/net/ethernet/xilinx/axi ethernet: Correct Copyright	2012-04-13 13:58:42 -04:00
xilinx_emaclite.c	net: emaclite: Code cleanup	2013-09-20 14:41:02 -04:00