- Update to 3.1-rc4.

suse-commit: 68e08b1c8cc38ef224901c48fcf309f9202f425a

diff --cc Makefile
Simple merge

diff --cc arch/x86/kernel/entry_32.S
Simple merge

diff --cc drivers/hid/hid-apple.c
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/misc/Kconfig
index cca3524,2d6423c..f845d7d
--- 1/drivers/misc/Kconfig
--- 2/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@@ -146,8 -146,8 +146,9 @@@ config PHANTO
  
  config INTEL_MID_PTI
        tristate "Parallel Trace Interface for MIPI P1149.7 cJTAG standard"
+       depends on PCI
        default n
 +      depends on X86_INTEL_MID
        help
          The PTI (Parallel Trace Interface) driver directs
          trace data routed from various parts in the system out

diff --cc drivers/tty/serial/8250.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc kernel/printk.c
Simple merge

diff --cc kernel/sysctl_binary.c
Simple merge

diff --cc net/bridge/br_if.c
index ac1813a,e738154..e56a3f7
--- 1/net/bridge/br_if.c
--- 2/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@@ -239,17 -239,12 +239,19 @@@ int br_add_bridge(struct net *net, cons
        if (!dev)
                return -ENOMEM;
  
 +      if (!try_module_get(THIS_MODULE)) {
 +              free_netdev(dev);
 +              return -ENOENT;
 +      }
 +
        dev_net_set(dev, net);
  
-       ret = register_netdev(dev);
-       if (ret)
+       res = register_netdev(dev);
 -      if (res)
++      if (res) {
+               free_netdev(dev);
 +              module_put(THIS_MODULE);
-       return ret;
++      }
+       return res;
  }
  
  int br_del_bridge(struct net *net, const char *name)