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

Pull more input subsystem updates from Dmitry Torokhov:
 "Just a few more driver fixes; new drivers will be coming in the next
  merge window"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: pwm-beeper - fix - scheduling while atomic
  Input: xpad - xbox one elite controller support
  Input: xpad - add more third-party controllers
  Input: xpad - prevent spurious input from wired Xbox 360 controllers
  Input: xpad - move pending clear to the correct location
  Input: uinput - handle compat ioctl for UI_SET_PHYS

diff --cc drivers/input/misc/pwm-beeper.c
index 8d71332,18663d4..5f9655d
--- 1/drivers/input/misc/pwm-beeper.c
--- 2/drivers/input/misc/pwm-beeper.c
+++ b/drivers/input/misc/pwm-beeper.c
@@@ -87,12 -115,8 +115,14 @@@ static int pwm_beeper_probe(struct plat
                goto err_free;
        }
  
 +      /*
 +       * FIXME: pwm_apply_args() should be removed when switching to
 +       * the atomic PWM API.
 +       */
 +      pwm_apply_args(beeper->pwm);
 +
+       INIT_WORK(&beeper->work, pwm_beeper_work);
+ 
        beeper->input = input_allocate_device();
        if (!beeper->input) {
                dev_err(&pdev->dev, "Failed to allocate input device\n");

diff --cc drivers/input/misc/uinput.c
Simple merge