diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-21 11:12:42 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-21 11:12:42 -0700 |
| commit | 48853389f206b689260ddfd3006816779ca7a52a (patch) | |
| tree | 8abc3be612779c3252190bc54a38eb0b3c258e19 /MAINTAINERS | |
| parent | 85a3685852d9ac7d92be9d824533c915a4597fa4 (diff) | |
| parent | c9eeb5084b27ffede2709e8775827729d0c7c46c (diff) | |
| download | op-kernel-dev-48853389f206b689260ddfd3006816779ca7a52a.zip op-kernel-dev-48853389f206b689260ddfd3006816779ca7a52a.tar.gz | |
Merge branch 'next' into for-linus
Prepare second round of updates for 4.1 merge window.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c98757d..460ab22 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10530,6 +10530,14 @@ L: linux-kernel@vger.kernel.org S: Maintained F: drivers/misc/vmw_balloon.c +VMWARE VMMOUSE SUBDRIVER +M: "VMware Graphics" <linux-graphics-maintainer@vmware.com> +M: "VMware, Inc." <pv-drivers@vmware.com> +L: linux-input@vger.kernel.org +S: Maintained +F: drivers/input/mouse/vmmouse.c +F: drivers/input/mouse/vmmouse.h + VMWARE VMXNET3 ETHERNET DRIVER M: Shreyas Bhatewara <sbhatewara@vmware.com> M: "VMware, Inc." <pv-drivers@vmware.com> |
