Merge tag 'v5.2' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 15 Jul 2019 16:42:32 +0000 (09:42 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 15 Jul 2019 16:42:32 +0000 (09:42 -0700)
commitecb41832bd2a7a3f8ac93527cec5e51e3827daed
treea382a3719eca9ac8a22ae7f1715d0bd4843dc8e2
parentd38b6cf50a6b911ee46683330f3af17fcceca509
parent0ecfebd2b52404ae0c54a878c872bb93363ada36
Merge tag 'v5.2' into next

Sync up with mainline to resolve conflicts in iforce driver.
25 files changed:
drivers/hid/hid-quirks.c
drivers/input/joydev.c
drivers/input/joystick/iforce/Kconfig
drivers/input/joystick/iforce/Makefile
drivers/input/joystick/iforce/iforce-ff.c
drivers/input/joystick/iforce/iforce-main.c
drivers/input/joystick/iforce/iforce-packets.c
drivers/input/joystick/iforce/iforce-serio.c
drivers/input/joystick/iforce/iforce-usb.c
drivers/input/joystick/iforce/iforce.h
drivers/input/keyboard/gpio_keys.c
drivers/input/keyboard/gpio_keys_polled.c
drivers/input/keyboard/imx_keypad.c
drivers/input/keyboard/mtk-pmic-keys.c
drivers/input/keyboard/sun4i-lradc-keys.c
drivers/input/misc/da9063_onkey.c
drivers/input/mouse/elan_i2c_core.c
drivers/input/mouse/elantech.c
drivers/input/mouse/elantech.h
drivers/input/mouse/synaptics.c
drivers/input/rmi4/rmi_f12.c
drivers/input/touchscreen/atmel_mxt_ts.c
drivers/input/touchscreen/auo-pixcir-ts.c
drivers/input/touchscreen/eeti_ts.c
drivers/input/touchscreen/iqs5xx.c