tree c5b2816b7367288e402101eea338837789afc019
parent 1cac6ec9b7f9c48a26309380656f399a0587b860
parent 9b2fb2da4edfb163842800abbeb4c14bc1759469
author Linus Torvalds <torvalds@linux-foundation.org> 1251141927 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1251141927 -0700

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: ucb1400_ts - enable interrupt unconditionally
  Input: ucb1400_ts - enable ADC Filter
  Input: wacom - don't use on-stack memory for report buffers
  Input: iforce - support new revision of ACT LABS Force RS
  Input: joydev - decouple axis and button map ioctls from input constants