diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-21 15:54:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-21 15:54:08 -0400 |
commit | b8ce8d7222b52200e61ea29523993e20751baaaa (patch) | |
tree | 323b47725de6726121aa78f98a88738105ee8202 /MAINTAINERS | |
parent | 1d11437f4fd02f9b5d3749675a1232216787dcc6 (diff) | |
parent | 48853389f206b689260ddfd3006816779ca7a52a (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull more input subsystem updates from Dmitry Torokhov:
- an update to Atmel MXT driver that makes it functional on Google
Pixel 2 boxes (both touchpad and touchscreen)
- a new VMware VMMouse driver that should allow us drop X vmmouse
driver that requires root privileges (since it accesses ioports)
- XBox One controllers now support force feedback (rumble)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: lm8333 - fix broken email address
Input: cyapa - fix setting suspend scan rate
Input: elan_i2c - fix calculating number of x and y traces.
Input: elan_i2c - report hovering contacts
Input: elants_i2c - zero-extend hardware ID in firmware name
Input: alps - document separate pointstick button bits for V2 devices
Input: atmel_mxt_ts - add support for Google Pixel 2
Input: xpad - add rumble support for Xbox One controller
Input: ff-core - use new debug macros
Input: add vmmouse driver
Input: elan_i2c - adjust for newer firmware pressure reporting
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1af6b9a9a6d5..b4b131a0b939 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -10597,6 +10597,14 @@ L: linux-kernel@vger.kernel.org | |||
10597 | S: Maintained | 10597 | S: Maintained |
10598 | F: drivers/misc/vmw_balloon.c | 10598 | F: drivers/misc/vmw_balloon.c |
10599 | 10599 | ||
10600 | VMWARE VMMOUSE SUBDRIVER | ||
10601 | M: "VMware Graphics" <linux-graphics-maintainer@vmware.com> | ||
10602 | M: "VMware, Inc." <pv-drivers@vmware.com> | ||
10603 | L: linux-input@vger.kernel.org | ||
10604 | S: Maintained | ||
10605 | F: drivers/input/mouse/vmmouse.c | ||
10606 | F: drivers/input/mouse/vmmouse.h | ||
10607 | |||
10600 | VMWARE VMXNET3 ETHERNET DRIVER | 10608 | VMWARE VMXNET3 ETHERNET DRIVER |
10601 | M: Shreyas Bhatewara <sbhatewara@vmware.com> | 10609 | M: Shreyas Bhatewara <sbhatewara@vmware.com> |
10602 | M: "VMware, Inc." <pv-drivers@vmware.com> | 10610 | M: "VMware, Inc." <pv-drivers@vmware.com> |