| commit | 24c6d02fe8c34bc958aa4c464efc1cc10d43e29d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 25 20:50:12 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 25 20:50:12 2011 -0700 |
| tree | 65ead181d36f9113ca72fc2709e79bb560cfde22 | |
| parent | 0dd61be7ec1be1b6820af978f901b9ae2c244dc6 [diff] | |
| parent | a0fa2206f550066d6948d43c5401e973e5f7d320 [diff] |
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