diff options
-rw-r--r-- | MAINTAINERS | 8 | ||||
-rw-r--r-- | drivers/misc/vmw_balloon.c | 3 |
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 | |||
9743 | S: Supported | 9743 | S: Supported |
9744 | F: arch/x86/kernel/cpu/vmware.c | 9744 | F: arch/x86/kernel/cpu/vmware.c |
9745 | 9745 | ||
9746 | VMWARE BALLOON DRIVER | ||
9747 | M: Xavier Deguillard <xdeguillard@vmware.com> | ||
9748 | M: Philip Moltmann <moltmann@vmware.com> | ||
9749 | M: "VMware, Inc." <pv-drivers@vmware.com> | ||
9750 | L: linux-kernel@vger.kernel.org | ||
9751 | S: Maintained | ||
9752 | F: drivers/misc/vmw_balloon.c | ||
9753 | |||
9746 | VMWARE VMXNET3 ETHERNET DRIVER | 9754 | VMWARE VMXNET3 ETHERNET DRIVER |
9747 | M: Shreyas Bhatewara <sbhatewara@vmware.com> | 9755 | M: Shreyas Bhatewara <sbhatewara@vmware.com> |
9748 | M: "VMware, Inc." <pv-drivers@vmware.com> | 9756 | M: "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 | /* |