Merge remote-tracking branch 'input/next'

Conflicts:
	drivers/input/keyboard/samsung-keypad.c

diff --cc drivers/input/keyboard/samsung-keypad.c
index 8a0060cd398277d0fe209fc8c3e7227f14d386e1,a6e010e016f8b990b512f731c7a18e953a32b9bf..aa936ee9446f4213e26dffb5dad8aa21bdddf869
--- 1/drivers/input/keyboard/samsung-keypad.c
--- 2/drivers/input/keyboard/samsung-keypad.c
+++ b/drivers/input/keyboard/samsung-keypad.c
@@@ -21,10 -21,8 +21,10 @@@
  #include <linux/module.h>
  #include <linux/platform_device.h>
  #include <linux/slab.h>
 +#include <linux/of.h>
 +#include <linux/of_gpio.h>
  #include <linux/sched.h>
- #include <plat/keypad.h>
+ #include <linux/input/samsung-keypad.h>
  
  #define SAMSUNG_KEYIFCON                      0x00
  #define SAMSUNG_KEYIFSTSCLR                   0x04
@@@ -578,24 -440,11 +578,22 @@@ static int samsung_keypad_resume(struc
  
        return 0;
  }
- 
- static const struct dev_pm_ops samsung_keypad_pm_ops = {
-       .suspend        = samsung_keypad_suspend,
-       .resume         = samsung_keypad_resume,
- };
  #endif
  
 +#ifdef CONFIG_OF
 +static const struct of_device_id samsung_keypad_dt_match[] = {
 +      { .compatible = "samsung,s3c6410-keypad" },
 +      { .compatible = "samsung,s5pv210-keypad" },
 +      {},
 +};
 +MODULE_DEVICE_TABLE(of, samsung_keypad_dt_match);
 +#else
 +#define samsung_keypad_dt_match NULL
 +#endif
 +
+ static SIMPLE_DEV_PM_OPS(samsung_keypad_pm_ops,
+                        samsung_keypad_suspend, samsung_keypad_resume);
+ 
  static struct platform_device_id samsung_keypad_driver_ids[] = {
        {
                .name           = "samsung-keypad",
@@@ -614,10 -463,7 +612,8 @@@ static struct platform_driver samsung_k
        .driver         = {
                .name   = "samsung-keypad",
                .owner  = THIS_MODULE,
- #ifdef CONFIG_PM
 +              .of_match_table = samsung_keypad_dt_match,
                .pm     = &samsung_keypad_pm_ops,
- #endif
        },
        .id_table       = samsung_keypad_driver_ids,
  };