diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-21 18:43:19 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-21 18:43:19 +0200 |
| commit | 60761c10904593f08e7a015718f26d2013b9b8f2 (patch) | |
| tree | 1b0bf2418e66595012ab7e965a2c8ac3fa0860b7 /MAINTAINERS | |
| parent | Merge tag 'staging-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | MAINTAINERS: add entry for VMware Balloon driver (diff) | |
| download | linux-60761c10904593f08e7a015718f26d2013b9b8f2.tar.xz linux-60761c10904593f08e7a015718f26d2013b9b8f2.zip | |
Merge tag 'char-misc-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char / misc driver fixes from Greg KH:
"Here are 3 patches, one a revert of the UIO patch you objected to in
3.16-rc1 and that no one wanted to defend, a w1 driver bugfix, and a
MAINTAINERS update for the vmware balloon driver.
All of these, except for the MAINTAINERS update which just got added,
have been in linux-next just fine"
* tag 'char-misc-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
MAINTAINERS: add entry for VMware Balloon driver
w1: mxc_w1: Fix incorrect "presence" status
Revert "uio: fix vma io range check in mmap"
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e36d18d8f0eb..eb47dfb6390a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9744,6 +9744,14 @@ L: virtualization@lists.linux-foundation.org S: Supported F: arch/x86/kernel/cpu/vmware.c +VMWARE BALLOON DRIVER +M: Xavier Deguillard <xdeguillard@vmware.com> +M: Philip Moltmann <moltmann@vmware.com> +M: "VMware, Inc." <pv-drivers@vmware.com> +L: linux-kernel@vger.kernel.org +S: Maintained +F: drivers/misc/vmw_balloon.c + VMWARE VMXNET3 ETHERNET DRIVER M: Shreyas Bhatewara <sbhatewara@vmware.com> M: "VMware, Inc." <pv-drivers@vmware.com> |