diff options
-rw-r--r-- | .mailmap | 2 | ||||
-rw-r--r-- | MAINTAINERS | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap index b99a238ee3bde..f7be2b7127b8d 100644 --- a/.mailmap +++ b/.mailmap @@ -438,6 +438,8 @@ Mukesh Ojha <quic_mojha@quicinc.com> <mojha@codeaurora.org> Muna Sinada <quic_msinada@quicinc.com> <msinada@codeaurora.org> Murali Nalajala <quic_mnalajal@quicinc.com> <mnalajal@codeaurora.org> Mythri P K <mythripk@ti.com> +Nadav Amit <nadav.amit@gmail.com> <namit@vmware.com> +Nadav Amit <nadav.amit@gmail.com> <namit@cs.technion.ac.il> Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com> Naoya Horiguchi <naoya.horiguchi@nec.com> <n-horiguchi@ah.jp.nec.com> Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com> diff --git a/MAINTAINERS b/MAINTAINERS index 19b5a14f9b164..1179e8a76192a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -23503,8 +23503,8 @@ F: Documentation/driver-api/vme.rst F: drivers/staging/vme_user/ VMWARE BALLOON DRIVER -M: Nadav Amit <namit@vmware.com> -R: VMware PV-Drivers Reviewers <pv-drivers@vmware.com> +M: Jerrin Shaji George <jerrin.shaji-george@broadcom.com> +R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com> L: linux-kernel@vger.kernel.org S: Supported F: drivers/misc/vmw_balloon.c |