From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 Mar 2011 03:50:12 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v2.6.39-rc1~58
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=24c6d02fe8c34bc958aa4c464efc1cc10d43e29d;p=~emulex%2Finfiniband.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: tsc2005 - fix locking issue
  Input: tsc2005 - use relative jiffies to schedule the watchdog
  Input: tsc2005 - driver should depend on GENERIC_HARDIRQS
---

24c6d02fe8c34bc958aa4c464efc1cc10d43e29d