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 /net/ipv4/tcp_timer.c | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (diff) | |
| parent | Input: ad7877 - keep dma rx buffers in seperate cache lines (diff) | |
| download | linux-dev-aa86f26bd81a46985f1b32e513638d1c36cf3104.tar.xz linux-dev-aa86f26bd81a46985f1b32e513638d1c36cf3104.zip | |
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 'net/ipv4/tcp_timer.c')
0 files changed, 0 insertions, 0 deletions