q3k
/
linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
linux/drivers/net/ethernet/xilinx
History
David S. Miller 56845d78ce Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/atheros/atlx/atl1.c
	drivers/net/ethernet/atheros/atlx/atl1.h

Resolved a conflict between a DMA error bug fix and NAPI
support changes in the atl1 driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2012-04-15 13:19:04 -04:00
..
Kconfig drivers/net/ethernet/xilinx: added Xilinx AXI Ethernet driver 2012-01-25 16:59:47 -05:00
Makefile drivers/net/ethernet/xilinx: added Xilinx AXI Ethernet driver 2012-01-25 16:59:47 -05:00
ll_temac.h
…
ll_temac_main.c ll_temac: Support the get_ts_info ethtool method. 2012-04-04 05:28:47 -04:00
ll_temac_mdio.c
…
xilinx_axienet.h drivers/net/ethernet/xilinx/axi ethernet: Correct Copyright 2012-04-13 13:58:42 -04:00
xilinx_axienet_main.c drivers/net/ethernet/xilinx/axi ethernet: Correct Copyright 2012-04-13 13:58:42 -04:00
xilinx_axienet_mdio.c drivers/net/ethernet/xilinx/axi ethernet: Correct Copyright 2012-04-13 13:58:42 -04:00
xilinx_emaclite.c netdev: ethernet dev_alloc_skb to netdev_alloc_skb 2012-02-08 18:46:38 -05:00