tree 87053114a75777dfdc6a81de97ae43fc55991ad8
parent 70c85057e0bde35eb56352a293ecb5d1641a0334
parent 656acd2bbc4ce7f224de499ee255698701396c48
author Linus Torvalds <torvalds@linux-foundation.org> 1214841489 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1214841489 -0700

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