Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
commit24c6d02fe8c34bc958aa4c464efc1cc10d43e29d
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Mar 2011 03:50:12 +0000 (25 20:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Mar 2011 03:50:12 +0000 (25 20:50 -0700)
tree65ead181d36f9113ca72fc2709e79bb560cfde22
parent0dd61be7ec1be1b6820af978f901b9ae2c244dc6
parenta0fa2206f550066d6948d43c5401e973e5f7d320
Merge branch 'for-linus' of git://git./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