diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-31 01:49:44 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-31 01:49:44 (GMT) |
| commit | 38dab9ac1c017e96dc98e978111e365134d41d13 (patch) | |
| tree | 5fc7b79e7f0be8ac28e0b232ac4afe8e02f1e1db /net/ipv6/netfilter/nf_conntrack_reasm.c | |
| parent | f9793e379bbb1188c72d8a367083290a14f98c97 (diff) | |
| parent | 195562194aad3a0a3915941077f283bcc6347b9b (diff) | |
| download | linux-38dab9ac1c017e96dc98e978111e365134d41d13.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input layer fixes from Dmitry Torokhov:
- a change to the ALPS driver where we had limit the quirk for
trackstick handling from being active on all Dells to just a few
models
- a fix for a build dependency issue in the sur40 driver
- a small clock handling fixup in the LPC32xx touchscreen driver
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: alps - only the Dell Latitude D420/430/620/630 have separate stick button bits
Input: sur40 - add dependency on VIDEO_V4L2
Input: lpc32xx_ts - fix warnings caused by enabling unprepared clock
Diffstat (limited to 'net/ipv6/netfilter/nf_conntrack_reasm.c')
0 files changed, 0 insertions, 0 deletions