]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70c8505 656acd2)
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)
* '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


Trivial merge
Linux 2.6 source tree