openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/net/ethernet/xilinx
History
David S. Miller efd0bf97de Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.

The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.

Conflicts:
	drivers/net/ethernet/nvidia/forcedeth.c
	drivers/net/wireless/libertas/cfg.c
 		2011-11-21 13:50:33 -05:00
..
Kconfig drivers/net/ethernet/*: Enabled vendor Kconfig options 2011-08-27 00:58:56 -07:00
Makefile 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
ll_temac_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-11-21 13:50:33 -05:00
ll_temac_mdio.c xilinx/ll_temac: Move the Xilinx drivers 2011-08-12 03:41:30 -07:00
xilinx_emaclite.c xilinx/ll_temac: Move the Xilinx drivers 2011-08-12 03:41:30 -07:00