Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: atkbd - add force relese key quirk for Soltech TA12
  Input: fix EVIOCGNAME/JSIOCGNAME regression
  Input: atkbd - add forced release keys quirk for FSC Amilo Pi 3525
  Input: pcspkr - switch driver to dev_pm_ops
  Input: xpad - don't resend successfully sent outgoing requests
  Input: wistron_btns - recognize Maxdata Pro 7000 notebooks

diff --combined drivers/input/misc/pcspkr.c
index 6d67af5,663bbc7..21cb755
--- 1/drivers/input/misc/pcspkr.c
--- 2/drivers/input/misc/pcspkr.c
+++ b/drivers/input/misc/pcspkr.c
@@@ -17,7 -17,6 +17,7 @@@
  #include <linux/init.h>
  #include <linux/input.h>
  #include <linux/platform_device.h>
 +#include <linux/timex.h>
  #include <asm/io.h>
  
  MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
@@@ -114,7 -113,7 +114,7 @@@ static int __devexit pcspkr_remove(stru
        return 0;
  }
  
- static int pcspkr_suspend(struct platform_device *dev, pm_message_t state)
+ static int pcspkr_suspend(struct device *dev)
  {
        pcspkr_event(NULL, EV_SND, SND_BELL, 0);
  
@@@ -127,14 -126,18 +127,18 @@@ static void pcspkr_shutdown(struct plat
        pcspkr_event(NULL, EV_SND, SND_BELL, 0);
  }
  
+ static struct dev_pm_ops pcspkr_pm_ops = {
+       .suspend = pcspkr_suspend,
+ };
+ 
  static struct platform_driver pcspkr_platform_driver = {
        .driver         = {
                .name   = "pcspkr",
                .owner  = THIS_MODULE,
+               .pm     = &pcspkr_pm_ops,
        },
        .probe          = pcspkr_probe,
        .remove         = __devexit_p(pcspkr_remove),
-       .suspend        = pcspkr_suspend,
        .shutdown       = pcspkr_shutdown,
  };