David S. Miller 4b87f92259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: Documentation/networking/ip-sysctl.txt drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c Both conflicts were simply overlapping context. A build fix for qlcnic is in here too, simply removing the added devinit annotations which no longer exist. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-01-15 15:05:59 -05:00
..
Kconfig	net: ethernet: xilinx: Do not use axienet on PPC	2013-01-10 14:28:26 -08:00
Makefile	drivers/net/ethernet/xilinx: added Xilinx AXI Ethernet driver	2012-01-25 16:59:47 -05:00
ll_temac.h	xilinx/ll_temac: Move the Xilinx drivers	2011-08-12 03:41:30 -07:00
ll_temac_main.c	ll_temac: fix mac address setting	2013-01-03 22:37:36 -08:00
ll_temac_mdio.c	xilinx/ll_temac: Move the Xilinx drivers	2011-08-12 03:41:30 -07:00
xilinx_axienet.h	drivers/net/ethernet/xilinx/axi ethernet: Correct Copyright	2012-04-13 13:58:42 -04:00
xilinx_axienet_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-15 15:05:59 -05:00
xilinx_axienet_mdio.c	drivers/net/ethernet/xilinx/axi ethernet: Correct Copyright	2012-04-13 13:58:42 -04:00
xilinx_emaclite.c	net/xilinx: remove __dev* attributes	2012-12-03 11:16:56 -08:00