[PATCH] Update James Hogan's email address

[James Hogan]

From: James Hogan <jhogan@xxxxxxxxxx>

Update my imgtec.com and personal email address to my kernel.org one in
a few places as MIPS will soon no longer be part of Imagination
Technologies, and add mappings in .mailcap so get_maintainer.pl reports
the right address.

Signed-off-by: James Hogan <jhogan@xxxxxxxxxx>
---
Linus: Are you happy to apply this patch directly?
---
 .mailmap                              | 2 ++
 Documentation/ABI/testing/sysfs-power | 2 +-
 MAINTAINERS                           | 6 +++---
 drivers/i2c/busses/i2c-img-scb.c      | 2 +-
 drivers/media/rc/ir-sharp-decoder.c   | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.mailmap b/.mailmap
index 5273cfd70ad6..c7b10caecc4e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -68,6 +68,8 @@ Jacob Shin <Jacob.Shin@xxxxxxx>
 James Bottomley <jejb@mulgrave.(none)>
 James Bottomley <jejb@xxxxxxxxxxxxxxxxxxxxxxx>
 James E Wilson <wilson@xxxxxxxxxxxx>
+James Hogan <jhogan@xxxxxxxxxx> <james.hogan@xxxxxxxxxx>
+James Hogan <jhogan@xxxxxxxxxx> <james@xxxxxxxxxxxxx>
 James Ketrenos <jketreno@io.(none)>
 Javi Merino <javi.merino@xxxxxxxxxx> <javi.merino@xxxxxxx>
 <javier@xxxxxxxxxxxxxxx> <javier.martinez@xxxxxxxxxxxxxxx>
diff --git a/Documentation/ABI/testing/sysfs-power b/Documentation/ABI/testing/sysfs-power
index 713cab1d5f12..a1d1612f3651 100644
--- a/Documentation/ABI/testing/sysfs-power
+++ b/Documentation/ABI/testing/sysfs-power
@@ -127,7 +127,7 @@ Description:
 
 What;		/sys/power/pm_trace_dev_match
 Date:		October 2010
-Contact:	James Hogan <james@xxxxxxxxxxxxx>
+Contact:	James Hogan <jhogan@xxxxxxxxxx>
 Description:
 		The /sys/power/pm_trace_dev_match file contains the name of the
 		device associated with the last PM event point saved in the RTC
diff --git a/MAINTAINERS b/MAINTAINERS
index 65b0c88d5ee0..3f05fc6961ad 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6738,7 +6738,7 @@ F:	Documentation/devicetree/bindings/auxdisplay/img-ascii-lcd.txt
 F:	drivers/auxdisplay/img-ascii-lcd.c
 
 IMGTEC IR DECODER DRIVER
-M:	James Hogan <james.hogan@xxxxxxxxxx>
+M:	James Hogan <jhogan@xxxxxxxxxx>
 S:	Maintained
 F:	drivers/media/rc/img-ir/
 
@@ -7562,7 +7562,7 @@ F:	arch/arm64/include/asm/kvm*
 F:	arch/arm64/kvm/
 
 KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
-M:	James Hogan <james.hogan@xxxxxxxxxx>
+M:	James Hogan <jhogan@xxxxxxxxxx>
 L:	linux-mips@xxxxxxxxxxxxxx
 S:	Supported
 F:	arch/mips/include/uapi/asm/kvm*
@@ -8885,7 +8885,7 @@ F:	Documentation/devicetree/bindings/media/meson-ao-cec.txt
 T:	git git://linuxtv.org/media_tree.git
 
 METAG ARCHITECTURE
-M:	James Hogan <james.hogan@xxxxxxxxxx>
+M:	James Hogan <jhogan@xxxxxxxxxx>
 L:	linux-metag@xxxxxxxxxxxxxxx
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git
 S:	Odd Fixes
diff --git a/drivers/i2c/busses/i2c-img-scb.c b/drivers/i2c/busses/i2c-img-scb.c
index 84fb35f6837f..eb1d91b986fd 100644
--- a/drivers/i2c/busses/i2c-img-scb.c
+++ b/drivers/i2c/busses/i2c-img-scb.c
@@ -1459,6 +1459,6 @@ static struct platform_driver img_scb_i2c_driver = {
 };
 module_platform_driver(img_scb_i2c_driver);
 
-MODULE_AUTHOR("James Hogan <james.hogan@xxxxxxxxxx>");
+MODULE_AUTHOR("James Hogan <jhogan@xxxxxxxxxx>");
 MODULE_DESCRIPTION("IMG host I2C driver");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/media/rc/ir-sharp-decoder.c b/drivers/media/rc/ir-sharp-decoder.c
index ed43a4212479..129b558acc92 100644
--- a/drivers/media/rc/ir-sharp-decoder.c
+++ b/drivers/media/rc/ir-sharp-decoder.c
@@ -245,5 +245,5 @@ module_init(ir_sharp_decode_init);
 module_exit(ir_sharp_decode_exit);
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("James Hogan <james.hogan@xxxxxxxxxx>");
+MODULE_AUTHOR("James Hogan <jhogan@xxxxxxxxxx>");
 MODULE_DESCRIPTION("Sharp IR protocol decoder");
-- 
2.14.1