From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Jun 2008 15:58:09 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v2.6.26-rc9~87
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1441b9a41c33aa9236008a7cfe49a8e723fb397;p=linux-2.6

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
---

e1441b9a41c33aa9236008a7cfe49a8e723fb397