leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
c96bdc0c9e
linux/drivers/net/ethernet/8390
History
David S. Miller 24bc518a68 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/wireless/iwlwifi/pcie/tx.c

Minor iwlwifi conflict in TX queue disabling between 'net', which
removed a bogus warning, and 'net-next' which added some status
register poking code.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-11-25 12:49:17 -05:00
..
3c503.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
3c503.h
8390.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
8390.h ethernet: Convert ETHER_ADDR_LEN uses to ETH_ALEN 2011-11-16 20:23:17 -05:00
8390p.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
ac3200.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
apne.c ethernet: Remove casts to same type 2012-06-06 09:31:33 -07:00
ax88796.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-04-10 14:30:45 -04:00
axnet_cs.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
e2100.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
es3210.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
etherh.c net/ethernet: remove useless is_valid_ether_addr from drivers ndo_open 2012-11-19 19:01:18 -05:00
hp-plus.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
hp.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
hydra.c ethernet: Convert ETHER_ADDR_LEN uses to ETH_ALEN 2011-11-16 20:23:17 -05:00
Kconfig net: add support for NS8390 based eth controllers on some ColdFire CPU boards 2012-07-12 07:54:45 -07:00
lib8390.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
lne390.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
mac8390.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
Makefile net: add support for NS8390 based eth controllers on some ColdFire CPU boards 2012-07-12 07:54:45 -07:00
mcf8390.c net: add support for NS8390 based eth controllers on some ColdFire CPU boards 2012-07-12 07:54:45 -07:00
ne2k-pci.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
ne3210.c sections: fix section conflicts in drivers/net 2012-10-06 03:04:42 +09:00
ne-h8300.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
ne.c ne2000: add the right platform device 2012-11-20 13:48:49 -05:00
pcnet_cs.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
smc-ultra32.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
smc-ultra.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
stnic.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
wd.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
zorro8390.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00