Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jul 2010 15:22:40 +0000 (08:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jul 2010 15:22:40 +0000 (08:22 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: w90p910_ts - fix call to setup_timer()
  Input: synaptics - fix wrong dimensions check
  Input: i8042 - mark stubs in i8042.h "static inline"


Trivial merge