- Update to 3.1-final.

suse-commit: ec0449cb9646125f45280695561f543633472f44

diff --cc Makefile
Simple merge

diff --cc arch/x86/mm/init.c
Simple merge

diff --cc net/bridge/br_if.c
index e56a3f7,1d420f6..01b140c
--- 1/net/bridge/br_if.c
--- 2/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@@ -275,11 -269,9 +276,11 @@@ int br_del_bridge(struct net *net, cons
        }
  
        else
-               del_br(netdev_priv(dev), NULL);
+               br_dev_delete(dev, NULL);
  
        rtnl_unlock();
 +      if (ret == 0)
 +              module_put(THIS_MODULE);
        return ret;
  }