Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 May 2016 02:14:35 +0000 (19:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 May 2016 02:14:35 +0000 (19:14 -0700)
commited2608faa0f701b1dbc65277a9e5c7ff7118bfd4
tree542950c65a22d6a149322849b6f45657e12d6a2e
parent06d2e7812ecd1b585c5e9e7bda8ee90acebaef8c
parentf49cf3b8b4c841457244c461c66186a719e13bcc
Merge branch 'for-linus' of git://git./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
drivers/input/misc/pwm-beeper.c
drivers/input/misc/uinput.c