aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/asn1_compiler.c
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2015-07-11 18:16:04 +0000
committerLinus Torvalds <[email protected]>2015-07-11 18:16:04 +0000
commit8a7b8ff41ddc811f3e06d0bf6892bc3e2b1764b7 (patch)
treeb469c40162a0dd1bd1774ebfdd0285661c9a814a /scripts/asn1_compiler.c
parentMerge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff)
parentRevert "Input: synaptics - allocate 3 slots to keep stability in image sensors" (diff)
downloadkernel-8a7b8ff41ddc811f3e06d0bf6892bc3e2b1764b7.tar.gz
kernel-8a7b8ff41ddc811f3e06d0bf6892bc3e2b1764b7.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov: "A fix (revert) for a recent regression in Synaptics driver and a fix for Elan i2c touchpad driver" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Revert "Input: synaptics - allocate 3 slots to keep stability in image sensors" Input: elan_i2c - change the hover event from MT to ST
Diffstat (limited to 'scripts/asn1_compiler.c')
0 files changed, 0 insertions, 0 deletions