Merge commit 'v3.3-rc6' into next

diff --cc MAINTAINERS
Simple merge

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

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

diff --cc drivers/input/evdev.c
Simple merge

diff --cc drivers/input/keyboard/nomadik-ske-keypad.c
index 91c2fcb,e35566a..101e245
--- 1/drivers/input/keyboard/nomadik-ske-keypad.c
--- 2/drivers/input/keyboard/nomadik-ske-keypad.c
+++ b/drivers/input/keyboard/nomadik-ske-keypad.c
@@@ -381,11 -383,25 +381,22 @@@ static struct platform_driver ske_keypa
        .driver = {
                .name = "nmk-ske-keypad",
                .owner  = THIS_MODULE,
 -#ifdef CONFIG_PM
                .pm = &ske_keypad_dev_pm_ops,
 -#endif
        },
 -      .probe = ske_keypad_probe,
        .remove = __devexit_p(ske_keypad_remove),
  };
- module_platform_driver(ske_keypad_driver);
+ 
+ static int __init ske_keypad_init(void)
+ {
+       return platform_driver_probe(&ske_keypad_driver, ske_keypad_probe);
+ }
+ module_init(ske_keypad_init);
+ 
+ static void __exit ske_keypad_exit(void)
+ {
+       platform_driver_unregister(&ske_keypad_driver);
+ }
+ module_exit(ske_keypad_exit);
  
  MODULE_LICENSE("GPL v2");
  MODULE_AUTHOR("Naveen Kumar <naveen.gaddipati@stericsson.com> / Sundar Iyer <sundar.iyer@stericsson.com>");

diff --cc drivers/input/keyboard/samsung-keypad.c
Simple merge

diff --cc drivers/input/mouse/psmouse-base.c
Simple merge

diff --cc drivers/input/mouse/sentelic.c
Simple merge

diff --cc drivers/input/serio/at32psif.c
index d0d861f,95280f9..36e799c
--- 1/drivers/input/serio/at32psif.c
--- 2/drivers/input/serio/at32psif.c
+++ b/drivers/input/serio/at32psif.c
@@@ -355,10 -354,23 +355,22 @@@ static struct platform_driver psif_driv
        .driver         = {
                .name   = "atmel_psif",
                .owner  = THIS_MODULE,
 +              .pm     = &psif_pm_ops,
        },
 -      .suspend        = psif_suspend,
 -      .resume         = psif_resume,
  };
- module_platform_driver(psif_driver);
+ 
+ static int __init psif_init(void)
+ {
+       return platform_driver_probe(&psif_driver, psif_probe);
+ }
+ 
+ static void __exit psif_exit(void)
+ {
+       platform_driver_unregister(&psif_driver);
+ }
+ 
+ module_init(psif_init);
+ module_exit(psif_exit);
  
  MODULE_AUTHOR("Hans-Christian Egtvedt <egtvedt@samfundet.no>");
  MODULE_DESCRIPTION("Atmel AVR32 PSIF PS/2 driver");

diff --cc drivers/input/tablet/wacom_sys.c
Simple merge

diff --cc drivers/input/tablet/wacom_wac.c
Simple merge

diff --cc drivers/input/touchscreen/atmel-wm97xx.c
index 429c430,8034cbb..c5c2dbb
--- 1/drivers/input/touchscreen/atmel-wm97xx.c
--- 2/drivers/input/touchscreen/atmel-wm97xx.c
+++ b/drivers/input/touchscreen/atmel-wm97xx.c
@@@ -426,12 -424,23 +426,23 @@@ static SIMPLE_DEV_PM_OPS(atmel_wm97xx_p
  static struct platform_driver atmel_wm97xx_driver = {
        .remove         = __exit_p(atmel_wm97xx_remove),
        .driver         = {
 -              .name = "wm97xx-touch",
 +              .name   = "wm97xx-touch",
 +              .owner  = THIS_MODULE,
 +              .pm     = &atmel_wm97xx_pm_ops,
        },
 -      .suspend        = atmel_wm97xx_suspend,
 -      .resume         = atmel_wm97xx_resume,
  };
- module_platform_driver(atmel_wm97xx_driver);
+ 
+ static int __init atmel_wm97xx_init(void)
+ {
+       return platform_driver_probe(&atmel_wm97xx_driver, atmel_wm97xx_probe);
+ }
+ module_init(atmel_wm97xx_init);
+ 
+ static void __exit atmel_wm97xx_exit(void)
+ {
+       platform_driver_unregister(&atmel_wm97xx_driver);
+ }
+ module_exit(atmel_wm97xx_exit);
  
  MODULE_AUTHOR("Hans-Christian Egtvedt <egtvedt@samfundet.no>");
  MODULE_DESCRIPTION("wm97xx continuous touch driver for Atmel AT91 and AVR32");

diff --cc drivers/input/touchscreen/usbtouchscreen.c
Simple merge

diff --cc kernel/time/timekeeping.c
Simple merge