Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jul 2012 16:50:39 +0000 (09:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jul 2012 16:50:39 +0000 (09:50 -0700)
commit1b74a8684e3c5cbbe5e798de9e07e3a087c7b853
treeb8c66506e1f4d18113796e94d4ab5d30b6f07b2c
parentc4aed353b1b079eb4843e6a708fc68b4b28f72aa
parent9b7e31bbf4bb58b12e11a7f24b7c3e48bbd2f4da
Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull input layer fixes from Dmitry Torokhov:
 "Two fixes for regressions in Wacom driver and fixes for drivers using
  threaded IRQ framework without specifying IRQF_ONESHOT."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: request threaded-only IRQs with IRQF_ONESHOT
  Input: wacom - don't retrieve touch_max when it is predefined
  Input: wacom - fix retrieving touch_max bug
  Input: fix input.h kernel-doc warning
drivers/input/joystick/as5011.c
drivers/input/tablet/wacom_sys.c