Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Sep 2013 11:13:39 +0000 (07:13 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Sep 2013 11:13:39 +0000 (07:13 -0400)
commit8bf5e36d0429e9b8fc2c84966577f10386bd7195
treed060b4ddc3cbc8bddd35a2aa182ed9bed9efb0de
parent05a8252bdefe9f2a8931c720afe6200671d631a6
parentc7dc65737c9a607d3e6f8478659876074ad129b8
Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull input update from Dmitry Torokhov:
 "The only change is David Hermann's new EVIOCREVOKE evdev ioctl that
  allows safely passing file descriptors to input devices to session
  processes and later being able to stop delivery of events through
  these fds so that inactive sessions will no longer receive user input
  that does not belong to them"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: evdev - add EVIOCREVOKE ioctl
include/uapi/linux/input.h