Merge branch 'tmp' into upstream

drivers/net/3c59x.c

drivers/net/8139cp.c

drivers/net/8139too.c

drivers/net/amd8111e.c

drivers/net/ariadne.c

drivers/net/at1700.c

drivers/net/atarilance.c

drivers/net/au1000_eth.c

drivers/net/eepro.c

drivers/net/epic100.c

drivers/net/fealnx.c

drivers/net/fec.c

drivers/net/gianfar.c

drivers/net/hamachi.c

drivers/net/ioc3-eth.c

drivers/net/lance.c

drivers/net/natsemi.c

drivers/net/pci-skeleton.c

drivers/net/pcmcia/fmvj18x_cs.c

drivers/net/pcmcia/smc91c92_cs.c