- Update to 3.3-rc7.

suse-commit: 81a18ea866f34e6920a7cc1c76dc57f166b8f0f3

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc Makefile
Simple merge

diff --cc drivers/block/floppy.c
Simple merge

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

diff --cc drivers/hwmon/Kconfig
Simple merge

diff --cc drivers/net/ethernet/ibm/ehea/ehea_main.c
Simple merge

diff --cc fs/aio.c
index b380422,b9d64d8..50424f2
--- 1/fs/aio.c
--- 2/fs/aio.c
+++ b/fs/aio.c
@@@ -1437,14 -1336,10 +1437,14 @@@ SYSCALL_DEFINE2(io_setup, unsigned, nr_
        ret = PTR_ERR(ioctx);
        if (!IS_ERR(ioctx)) {
                ret = put_user(ioctx->user_id, ctxp);
 -              if (!ret) {
 +#ifdef CONFIG_EPOLL
 +              if (make_fd && ret >= 0)
 +                      ret = make_aio_fd(ioctx);
 +#endif
-               if (ret >= 0)
++              if (ret >= 0) {
+                       put_ioctx(ioctx);
 -                      return 0;
 +                      return ret;
- 
-               get_ioctx(ioctx); /* io_destroy() expects us to hold a ref */
+               }
                io_destroy(ioctx);
        }
  

diff --cc kernel/printk.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc mm/mmap.c
Simple merge

diff --cc net/ipv6/addrconf.c
Simple merge