diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-20 12:22:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-20 12:22:30 -0700 |
| commit | f1a3b43cc1f50c6ee5ba582f2025db3dea891208 (patch) | |
| tree | fc35bc690860bae547d1a3cec2b567706ff2bc9f /drivers/ntb/Makefile | |
| parent | ac60602a6d8f6830dee89f4b87ee005f62eb7171 (diff) | |
| parent | c39f2d9db0fd81ea20bb5cce9b3f082ca63753e2 (diff) | |
| download | linux-f1a3b43cc1f50c6ee5ba582f2025db3dea891208.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull more input updates from Dmitry Torokhov:
- Apple SPI keyboard and trackpad driver for newer Macs
- ALPS driver will ignore trackpoint-only devices to give the
trackpoint driver a chance to handle them properly
- another Lenovo is switched over to SMbus from PS/2
- assorted driver fixups.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: alps - fix a mismatch between a condition check and its comment
Input: psmouse - fix build error of multiple definition
Input: applespi - remove set but not used variables 'sts'
Input: add Apple SPI keyboard and trackpad driver
Input: alps - don't handle ALPS cs19 trackpoint-only device
Input: hyperv-keyboard - remove dependencies on PAGE_SIZE for ring buffer
Input: adp5589 - initialize GPIO controller parent device
Input: iforce - remove empty multiline comments
Input: synaptics - fix misuse of strlcpy
Input: auo-pixcir-ts - switch to using devm_add_action_or_reset()
Input: gtco - bounds check collection indent level
Input: mtk-pmic-keys - add of_node_put() before return
Input: sun4i-lradc-keys - add of_node_put() before return
Input: synaptics - whitelist Lenovo T580 SMBus intertouch
Diffstat (limited to 'drivers/ntb/Makefile')
0 files changed, 0 insertions, 0 deletions