summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-06-21 06:43:19 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-21 06:43:19 -1000
commit60761c10904593f08e7a015718f26d2013b9b8f2 (patch)
tree1b0bf2418e66595012ab7e965a2c8ac3fa0860b7 /drivers/misc
parente6934ab460e18d2229de2ef98b2745c39b83c17b (diff)
parent73b35d07ee20d6af95359fb86540528709dd58bb (diff)
downloadop-kernel-dev-60761c10904593f08e7a015718f26d2013b9b8f2.zip
op-kernel-dev-60761c10904593f08e7a015718f26d2013b9b8f2.tar.gz
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 'drivers/misc')
-rw-r--r--drivers/misc/vmw_balloon.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c
index 2421835..1916174 100644
--- a/drivers/misc/vmw_balloon.c
+++ b/drivers/misc/vmw_balloon.c
@@ -17,7 +17,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Maintained by: Dmitry Torokhov <dtor@vmware.com>
+ * Maintained by: Xavier Deguillard <xdeguillard@vmware.com>
+ * Philip Moltmann <moltmann@vmware.com>
*/
/*
OpenPOWER on IntegriCloud