David S. Miller 06c54055be Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c net/bridge/br_multicast.c net/ipv6/sit.c The conflicts were minor: 1) sit.c changes overlap with change to ip_tunnel_xmit() signature. 2) br_multicast.c had an overlap between computing max_delay using msecs_to_jiffies and turning MLDV2_MRC() into an inline function with a name using lowercase instead of uppercase letters. 3) stmmac had two overlapping changes, one which conditionally allocated and hooked up a dma_cfg based upon the presence of the pbl OF property, and another one handling store-and-forward DMA made. The latter of which should not go into the new of_find_property() basic block. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-09-05 14:58:52 -04:00
..
Kconfig	net: emaclite: Enable emaclite for Xilinx Arm Zynq platform	2013-05-30 17:08:43 -07:00
ll_temac_main.c	drivers:net: Convert dma_alloc_coherent(...__GFP_ZERO) to dma_zalloc_coherent	2013-08-29 21:55:23 -04:00
ll_temac_mdio.c	xilinx/ll_temac: Move the Xilinx drivers	2011-08-12 03:41:30 -07:00
ll_temac.h	xilinx/ll_temac: Move the Xilinx drivers	2011-08-12 03:41:30 -07:00
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: xilinx_emaclite: remove unnecessary dev_set_drvdata()	2013-08-21 12:27:04 -07:00