summaryrefslogtreecommitdiff
path: root/drivers/ide
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-30 08:58:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-30 08:58:09 -0700
commite1441b9a41c33aa9236008a7cfe49a8e723fb397 (patch)
tree87053114a75777dfdc6a81de97ae43fc55991ad8 /drivers/ide
parent70c85057e0bde35eb56352a293ecb5d1641a0334 (diff)
parent656acd2bbc4ce7f224de499ee255698701396c48 (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: fix locking in force-feedback core Input: add KEY_MEDIA_REPEAT definition
Diffstat (limited to 'drivers/ide')
0 files changed, 0 insertions, 0 deletions