diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-06 14:10:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-06 14:10:08 -0700 |
| commit | 9e441639d1ed78245600191f0fa45e106935a9dc (patch) | |
| tree | b38e8ada65f7621277c3e6993e2c04f1727a69ff /net/ipv6/ip6mr.c | |
| parent | f8b3d8a5af7559a58613384cd23fc03a3c787acf (diff) | |
| parent | 58d8a3be36cf0fe2eb2609e205bb07a141c29a7c (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
"Updates for the input subsystem - two more tweaks for ALPS driver to
work out kinks after splitting the touchpad, trackstick, and potential
external PS/2 mouse into separate input devices.
Changes to support ALPS SS4 devices (protocol V8) will be coming in
4.1..."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: alps - document stick behavior for protocol V2
Input: alps - report V2 Dualpoint Stick events via the right evdev node
Input: alps - report interleaved bare PS/2 packets via dev3
Diffstat (limited to 'net/ipv6/ip6mr.c')
0 files changed, 0 insertions, 0 deletions