Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 10 May 2019 18:40:35 +0000 (11:40 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 10 May 2019 18:40:35 +0000 (11:40 -0700)
commit14e0c7317ed58bcd15af5c3d09818ee0f2e3984c
treef9b63dc681574484c23c6b01be81f17cf9c64d6a
parent3a349763cf11e63534b8f2d302f2d0c790566497
parent0981949da8f7498b96c6e0ae60680865ca283bf1
Merge branch 'next' into for-linus

Prepare input updates for 5.2 merge window.
drivers/hid/hid-input.c
drivers/input/keyboard/Kconfig
drivers/input/keyboard/snvs_pwrkey.c
drivers/input/touchscreen/Kconfig
include/uapi/linux/input-event-codes.h