From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Jul 2010 15:22:40 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v2.6.35-rc6~38
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=cc10b6ffd39ef982f86de68d95e5811df82cf819;p=net-next-2.6.git

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"
---

cc10b6ffd39ef982f86de68d95e5811df82cf819