summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-30 17:58:09 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-30 17:58:09 +0200
commite1441b9a41c33aa9236008a7cfe49a8e723fb397 (patch)
tree87053114a75777dfdc6a81de97ae43fc55991ad8 /drivers/media
parentMerge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff)
parentInput: fix locking in force-feedback core (diff)
downloadlinux-e1441b9a41c33aa9236008a7cfe49a8e723fb397.tar.xz
linux-e1441b9a41c33aa9236008a7cfe49a8e723fb397.zip
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/media')
0 files changed, 0 insertions, 0 deletions