From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Jul 2012 16:50:39 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v3.5-rc6~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1b74a8684e3c5cbbe5e798de9e07e3a087c7b853;p=karo-tx-linux.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
---

1b74a8684e3c5cbbe5e798de9e07e3a087c7b853