Merge redhat.com:/spare/repo/linux-2.5

into redhat.com:/spare/repo/netdev-2.6/netdev-alloc-1

diff --cc drivers/net/dummy.c
index 754c9f1f20e468ad377736751680515475e09523,ca4688026a04891837a35c7b3d5d4b618017a222..5cca442bd2ac378e0672f4539258d17bec184649
--- 1/drivers/net/dummy.c
--- 2/drivers/net/dummy.c
+++ b/drivers/net/dummy.c
@@@ -103,12 -96,9 +103,12 @@@ static int __init dummy_init_one(int in
                return -ENOMEM;
  
        if ((err = register_netdev(dev_dummy))) {
-               kfree(dev_dummy);
+               free_netdev(dev_dummy);
                dev_dummy = NULL;
 +      } else {
 +              dummies[index] = dev_dummy; 
        }
 +
        return err;
  }
  

diff --cc drivers/net/tokenring/smctr.c
Simple merge

diff --cc net/core/dev.c
Simple merge