• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 6fb1b304
    Linus Torvalds authored
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: wacom - pass touch resolution to clients through input_absinfo
      Input: wacom - add 2 Bamboo Pen and touch models
      Input: sysrq - ensure sysrq_enabled and __sysrq_enabled are consistent
      Input: sparse-keymap - fix KEY_VSW handling in sparse_keymap_setup
      Input: tegra-kbc - add tegra keyboard driver
      Input: gpio_keys - switch to using request_any_context_irq
      Input: serio - allow registered drivers to get status flag
      Input: ct82710c - return proper error code for ct82c710_open
      Input: bu21013_ts - added regulator support
      Input: bu21013_ts - remove duplicate resolution parameters
      Input: tnetv107x-ts - don't treat NULL clk as an error
      Input: tnetv107x-keypad - don't treat NULL clk as an error
    
    Fix up trivial conflicts in drivers/input/keyboard/Makefile due to
    additions of tc3589x/Tegra drivers
    6fb1b304
Makefile 2.11 KB