• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · fc47912d
    Linus Torvalds authored
    Pull input updates from Dmitry Torokhov:
     "A few drivers were updated with device tree bindings and others got a
      few small cleanups and fixes."
    
    Fix trivial conflict in drivers/input/keyboard/omap-keypad.c due to
    changes clashing with a whitespace cleanup.
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (28 commits)
      Input: wacom - mark Intuos5 pad as in-prox when touching buttons
      Input: synaptics - adjust threshold for treating position values as negative
      Input: hgpk - use %*ph to dump small buffer
      Input: gpio_keys_polled - fix dt pdata->nbuttons
      Input: Add KD[GS]KBDIACRUC ioctls to the compatible list
      Input: omap-keypad - fixed formatting
      Input: tegra - move platform data header
      Input: wacom - add support for EMR on Cintiq 24HD touch
      Input: s3c2410_ts - make s3c_ts_pmops const
      Input: samsung-keypad - use of_get_child_count() helper
      Input: samsung-keypad - use of_match_ptr()
      Input: uinput - fix formatting
      Input: uinput - specify exact bit sizes on userspace APIs
      Input: uinput - mark failed submission requests as free
      Input: uinput - fix race that can block nonblocking read
      Input: uinput - return -EINVAL when read buffer size is too small
      Input: uinput - take event lock when fetching events from buffer
      Input: get rid of MATCH_BIT() macro
      Input: rotary-encoder - add DT bindings
      Input: rotary-encoder - constify platform data pointers
      ...
    fc47912d
omap-keypad.c 9.7 KB