1 files changed, 25 insertions, 9 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 4caac2f6b01d..1026150ae90f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6620,9 +6620,9 @@ F:	arch/*/include/asm/suspend*.h
 
 HID CORE LAYER
 M:      Jiri Kosina <jikos@kernel.org>
-R:      Benjamin Tissoires <benjamin.tissoires@redhat.com>
+M:      Benjamin Tissoires <benjamin.tissoires@redhat.com>
 L:      linux-input@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
 S:      Maintained
 F:      drivers/hid/
 F:      include/linux/hid*
@@ -6874,6 +6874,13 @@ L:	linux-acpi@vger.kernel.org
 S:      Maintained
 F:      drivers/i2c/i2c-core-acpi.c
 
+I2C CONTROLLER DRIVER FOR NVIDIA GPU
+M:      Ajay Gupta <ajayg@nvidia.com>
+L:      linux-i2c@vger.kernel.org
+S:      Maintained
+F:      Documentation/i2c/busses/i2c-nvidia-gpu
+F:      drivers/i2c/busses/i2c-nvidia-gpu.c
+
 I2C MUXES
 M:      Peter Rosin <peda@axentia.se>
 L:      linux-i2c@vger.kernel.org
@@ -8380,7 +8387,7 @@ F:	drivers/media/dvb-frontends/lgdt3305.*
 LIBATA PATA ARASAN COMPACT FLASH CONTROLLER
 M:      Viresh Kumar <vireshk@kernel.org>
 L:      linux-ide@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 S:      Maintained
 F:      include/linux/pata_arasan_cf_data.h
 F:      drivers/ata/pata_arasan_cf.c
@@ -8397,7 +8404,7 @@ F:	drivers/ata/ata_generic.c
 LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS
 M:      Linus Walleij <linus.walleij@linaro.org>
 L:      linux-ide@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 S:      Maintained
 F:      drivers/ata/pata_ftide010.c
 F:      drivers/ata/sata_gemini.c
@@ -8416,7 +8423,7 @@ F:	include/linux/ahci_platform.h
 LIBATA SATA PROMISE TX2/TX4 CONTROLLER DRIVER
 M:      Mikael Pettersson <mikpelinux@gmail.com>
 L:      linux-ide@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 S:      Maintained
 F:      drivers/ata/sata_promise.*
 
@@ -10797,6 +10804,14 @@ L:	linux-omap@vger.kernel.org
 S:      Maintained
 F:      arch/arm/mach-omap2/omap_hwmod.*
 
+OMAP I2C DRIVER
+M:      Vignesh R <vigneshr@ti.com>
+L:      linux-omap@vger.kernel.org
+L:      linux-i2c@vger.kernel.org
+S:      Maintained
+F:      Documentation/devicetree/bindings/i2c/i2c-omap.txt
+F:      drivers/i2c/busses/i2c-omap.c
+
 OMAP IMAGING SUBSYSTEM (OMAP3 ISP and OMAP4 ISS)
 M:      Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:      linux-media@vger.kernel.org
@@ -10806,9 +10821,9 @@ F:	drivers/media/platform/omap3isp/
 F:      drivers/staging/media/omap4iss/
 
 OMAP MMC SUPPORT
-M:      Jarkko Lavinen <jarkko.lavinen@nokia.com>
+M:      Aaro Koskinen <aaro.koskinen@iki.fi>
 L:      linux-omap@vger.kernel.org
-S:      Maintained
+S:      Odd Fixes
 F:      drivers/mmc/host/omap.c
 
 OMAP POWER MANAGEMENT SUPPORT
@@ -11743,6 +11758,7 @@ F:	Documentation/devicetree/bindings/pinctrl/fsl,*
 PIN CONTROLLER - INTEL
 M:      Mika Westerberg <mika.westerberg@linux.intel.com>
 M:      Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git
 S:      Maintained
 F:      drivers/pinctrl/intel/
 
@@ -15449,9 +15465,9 @@ F:	include/linux/usb/gadget*
 
 USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)
 M:      Jiri Kosina <jikos@kernel.org>
-R:      Benjamin Tissoires <benjamin.tissoires@redhat.com>
+M:      Benjamin Tissoires <benjamin.tissoires@redhat.com>
 L:      linux-usb@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
 S:      Maintained
 F:      Documentation/hid/hiddev.txt
 F:      drivers/hid/usbhid/