Merge branch 'tmp' into upstream

diff --cc drivers/net/3c59x.c
Simple merge

diff --cc drivers/net/8139cp.c
Simple merge

diff --cc drivers/net/8139too.c
Simple merge

diff --cc drivers/net/amd8111e.c
Simple merge

diff --cc drivers/net/epic100.c
Simple merge

diff --cc drivers/net/fealnx.c
Simple merge

diff --cc drivers/net/natsemi.c
Simple merge

diff --cc drivers/net/pci-skeleton.c
Simple merge

diff --cc drivers/net/sis190.c
Simple merge

diff --cc drivers/net/sundance.c
Simple merge

diff --cc drivers/net/tulip/tulip_core.c
Simple merge

diff --cc drivers/net/tulip/winbond-840.c
index a64d682,8e7d6f0..0e5344f
--- 1/drivers/net/tulip/winbond-840.c
--- 2/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@@ -1358,10 -1378,8 +1358,8 @@@ static u32 __set_rx_mode(struct net_dev
        u32 rx_mode;
  
        if (dev->flags & IFF_PROMISC) {                 /* Set promiscuous. */
-               /* Unconditionally log net taps. */
-               printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n", dev->name);
                memset(mc_filter, 0xff, sizeof(mc_filter));
 -              rx_mode = AcceptBroadcast | AcceptMulticast | AcceptAllPhys
 +              rx_mode = RxAcceptBroadcast | AcceptMulticast | RxAcceptAllPhys
                        | AcceptMyPhys;
        } else if ((dev->mc_count > multicast_filter_limit)
                           ||  (dev->flags & IFF_ALLMULTI)) {

diff --cc drivers/net/typhoon.c
Simple merge

diff --cc drivers/net/via-rhine.c
Simple merge

diff --cc drivers/net/via-velocity.c
Simple merge

diff --cc drivers/net/via-velocity.h
Simple merge

diff --cc drivers/net/yellowfin.c
Simple merge