Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Jun 2008 15:58:09 +0000 (08:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Jun 2008 15:58:09 +0000 (08:58 -0700)
commite1441b9a41c33aa9236008a7cfe49a8e723fb397
tree87053114a75777dfdc6a81de97ae43fc55991ad8
parent70c85057e0bde35eb56352a293ecb5d1641a0334
parent656acd2bbc4ce7f224de499ee255698701396c48
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: fix locking in force-feedback core
  Input: add KEY_MEDIA_REPEAT definition