diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-13 07:28:43 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-13 07:28:43 -0700 | 
| commit | aa86f26bd81a46985f1b32e513638d1c36cf3104 (patch) | |
| tree | 86a3e978f511536ba2a12740b58392f3d3e13e11 /arch/m32r/include/asm/assembler.h | |
| parent | be835674b55324c1abe973b15343c3663910c620 (diff) | |
| parent | 3843384a055496dfed3c93ae883d964d8290fdab (diff) | |
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
Diffstat (limited to 'arch/m32r/include/asm/assembler.h')
0 files changed, 0 insertions, 0 deletions
