commit aa86f26bd81a46985f1b32e513638d1c36cf3104
author Linus Torvalds <torvalds@linux-foundation.org> Thu May 13 07:28:43 2010 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Thu May 13 07:28:43 2010 -0700
tree 86a3e978f511536ba2a12740b58392f3d3e13e11
parent be835674b55324c1abe973b15343c3663910c620
parent 3843384a055496dfed3c93ae883d964d8290fdab

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: ad7877 - keep dma rx buffers in seperate cache lines
  Input: psmouse - reset all types of mice before reconnecting
  Input: elantech - use all 3 bytes when checking version
  Input: iforce - fix Guillemot Jet Leader 3D entry
  Input: iforce - add Guillemot Jet Leader Force Feedback