aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS8
-rw-r--r--drivers/misc/vmw_balloon.c3
2 files changed, 10 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 134483f206e4..8baf56df3d84 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9743,6 +9743,14 @@ L: virtualization@lists.linux-foundation.org
9743S: Supported 9743S: Supported
9744F: arch/x86/kernel/cpu/vmware.c 9744F: arch/x86/kernel/cpu/vmware.c
9745 9745
9746VMWARE BALLOON DRIVER
9747M: Xavier Deguillard <xdeguillard@vmware.com>
9748M: Philip Moltmann <moltmann@vmware.com>
9749M: "VMware, Inc." <pv-drivers@vmware.com>
9750L: linux-kernel@vger.kernel.org
9751S: Maintained
9752F: drivers/misc/vmw_balloon.c
9753
9746VMWARE VMXNET3 ETHERNET DRIVER 9754VMWARE VMXNET3 ETHERNET DRIVER
9747M: Shreyas Bhatewara <sbhatewara@vmware.com> 9755M: Shreyas Bhatewara <sbhatewara@vmware.com>
9748M: "VMware, Inc." <pv-drivers@vmware.com> 9756M: "VMware, Inc." <pv-drivers@vmware.com>
diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c
index 2421835d5daf..191617492181 100644
--- a/drivers/misc/vmw_balloon.c
+++ b/drivers/misc/vmw_balloon.c
@@ -17,7 +17,8 @@
17 * along with this program; if not, write to the Free Software 17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
19 * 19 *
20 * Maintained by: Dmitry Torokhov <dtor@vmware.com> 20 * Maintained by: Xavier Deguillard <xdeguillard@vmware.com>
21 * Philip Moltmann <moltmann@vmware.com>
21 */ 22 */
22 23
23/* 24/*