You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David S. Miller 06c54055be Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c net/bridge/br_multicast.c net/ipv6/sit.c The conflicts were minor: 1) sit.c changes overlap with change to ip_tunnel_xmit() signature. 2) br_multicast.c had an overlap between computing max_delay using msecs_to_jiffies and turning MLDV2_MRC() into an inline function with a name using lowercase instead of uppercase letters. 3) stmmac had two overlapping changes, one which conditionally allocated and hooked up a dma_cfg based upon the presence of the pbl OF property, and another one handling store-and-forward DMA made. The latter of which should not go into the new of_find_property() basic block. Signed-off-by: David S. Miller <davem@davemloft.net>		12 years ago
..
8390.c	…
8390.h	…
8390p.c	…
Kconfig	drivers: net: ethernet: 8390: Kconfig: add H8300H_AKI3068NET and H8300H_H8MAX dependancy for NE_H8300	12 years ago
Makefile	drivers/net: delete the really obsolete 8390 based 10Mbit ISA drivers	12 years ago
apne.c	ethernet: Remove casts to same type	13 years ago
ax88796.c	net: ax88796: use dev_get_platdata()	12 years ago
axnet_cs.c	drivers/net: use module_pcmcia_driver() in pcmcia drivers	12 years ago
etherh.c	8390: remove __dev* attributes	12 years ago
hydra.c	drivers/net: fix up function prototypes after __dev* removals	12 years ago
lib8390.c	Remove all #inclusions of asm/system.h	13 years ago
mac8390.c	Remove all #inclusions of asm/system.h	13 years ago
mcf8390.c	net: add support for NS8390 based eth controllers on some ColdFire CPU boards	13 years ago
ne-h8300.c	Remove all #inclusions of asm/system.h	13 years ago
ne.c	net: ethernet: remove unnecessary platform_set_drvdata()	12 years ago
ne2k-pci.c	net/trivial: replace numeric with standard PM state macros	12 years ago
pcnet_cs.c	drivers/net: use module_pcmcia_driver() in pcmcia drivers	12 years ago
smc-ultra.c	Remove all #inclusions of asm/system.h	13 years ago
stnic.c	Remove all #inclusions of asm/system.h	13 years ago
wd.c	Remove all #inclusions of asm/system.h	13 years ago
zorro8390.c	drivers/net: fix up function prototypes after __dev* removals	12 years ago