tree cb6f24f40d0211513321b5230b87efc022aeed1f
parent 042bd1ff6cf255e71689db913786dbb6bb79542d
parent 5b39187fad6faefae5ce1a1e997651d4e382b135
author Linus Torvalds <torvalds@linux-foundation.org> 1279293760 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1279293760 -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: w90p910_ts - fix call to setup_timer()
  Input: synaptics - fix wrong dimensions check
  Input: i8042 - mark stubs in i8042.h "static inline"