summaryrefslogtreecommitdiffstats
path: root/drivers/net/tehuti.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-25 20:50:12 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-25 20:50:12 -0700
commit24c6d02fe8c34bc958aa4c464efc1cc10d43e29d (patch)
tree65ead181d36f9113ca72fc2709e79bb560cfde22 /drivers/net/tehuti.h
parent0dd61be7ec1be1b6820af978f901b9ae2c244dc6 (diff)
parenta0fa2206f550066d6948d43c5401e973e5f7d320 (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
Diffstat (limited to 'drivers/net/tehuti.h')
0 files changed, 0 insertions, 0 deletions