korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-08 23:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
348baa6c81
linux/drivers/net/ethernet/smsc
History
David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/intel/i40e/i40e_main.c
	drivers/net/macvtap.c

Both minor merge hassles, simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-18 16:42:06 -05:00
..
epic100.c epic100: replace printk with netdev_ calls 2013-11-02 01:19:24 -04:00
Kconfig netdev: smc91x: enable for xtensa 2013-11-08 13:27:55 -05:00
Makefile
smc91c92_cs.c smc91c92_cs: replace printk with netdev_ calls 2013-11-02 01:19:25 -04:00
smc91x.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-12-18 16:42:06 -05:00
smc91x.h ethernet: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
smc911x.c ethernet: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
smc911x.h ethernet: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
smc9194.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2013-11-13 17:40:34 +09:00
smc9194.h
smsc911x.c ethernet: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
smsc911x.h ethernet: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
smsc9420.c ethernet: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
smsc9420.h ethernet: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00