Merge branch 'master' into tablet-support

diff --cc configure.ac
Simple merge

diff --cc src/evdev-mt-touchpad.c
Simple merge

diff --cc src/evdev.c
Simple merge

diff --cc src/evdev.h
Simple merge

diff --cc src/libinput-util.h
Simple merge

diff --cc src/libinput.h
Simple merge

diff --cc test/Makefile.am
Simple merge

diff --cc test/device.c
Simple merge

diff --cc test/litest.c
index 4446f7b,cc348e9..3da187c
--- 1/test/litest.c
--- 2/test/litest.c
+++ b/test/litest.c
@@@ -371,8 -367,8 +371,10 @@@ extern struct litest_test_device litest
  extern struct litest_test_device litest_elantech_touchpad_device;
  extern struct litest_test_device litest_mouse_gladius_device;
  extern struct litest_test_device litest_mouse_wheel_click_angle_device;
+ extern struct litest_test_device litest_apple_keyboard_device;
+ extern struct litest_test_device litest_anker_mouse_kbd_device;
 +extern struct litest_test_device litest_waltop_tablet_device;
 +extern struct litest_test_device litest_huion_tablet_device;
  
  struct litest_test_device* devices[] = {
        &litest_synaptics_clickpad_device,
@@@ -410,8 -402,8 +412,10 @@@
        &litest_elantech_touchpad_device,
        &litest_mouse_gladius_device,
        &litest_mouse_wheel_click_angle_device,
+       &litest_apple_keyboard_device,
+       &litest_anker_mouse_kbd_device,
 +      &litest_waltop_tablet_device,
 +      &litest_huion_tablet_device,
        NULL,
  };
  

diff --cc test/litest.h
index 406e47f,e74e923..a272fe3
--- 1/test/litest.h
--- 2/test/litest.h
+++ b/test/litest.h
@@@ -184,12 -144,8 +184,14 @@@ enum litest_device_type 
        LITEST_ELANTECH_TOUCHPAD = -30,
        LITEST_MOUSE_GLADIUS = -31,
        LITEST_MOUSE_WHEEL_CLICK_ANGLE = -32,
-       LITEST_WACOM_BAMBOO = -33,
-       LITEST_WACOM_CINTIQ = -34,
-       LITEST_WACOM_INTUOS = -35,
-       LITEST_WACOM_ISDV4 = -36,
-       LITEST_WALTOP = -37,
-       LITEST_HUION_TABLET = -38,
+       LITEST_APPLE_KEYBOARD = -33,
+       LITEST_ANKER_MOUSE_KBD = -34,
++      LITEST_WACOM_BAMBOO = -35,
++      LITEST_WACOM_CINTIQ = -36,
++      LITEST_WACOM_INTUOS = -37,
++      LITEST_WACOM_ISDV4 = -38,
++      LITEST_WALTOP = -39,
++      LITEST_HUION_TABLET = -40,
  };
  
  enum litest_device_feature {

diff --cc test/misc.c
Simple merge

diff --cc tools/event-debug.c
Simple merge