Merge remote-tracking branch 'staging/staging-next'

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 316572ad49f8a8dd02ab5b2c601aaf5938542f11..40cf7cd5fa0e6f35368649dee282d802b6b0da92 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3698,6 +3698,14 @@ S:       Maintained
 F:     include/asm-generic/
 F:     include/uapi/asm-generic/
 
+GENERIC PHY FRAMEWORK
+M:     Kishon Vijay Abraham I <kishon@ti.com>
+L:     linux-kernel@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git
+S:     Supported
+F:     drivers/phy/
+F:     include/linux/phy/
+
 GENERIC UIO DRIVER FOR PCI DEVICES
 M:     "Michael S. Tsirkin" <mst@redhat.com>
 L:     kvm@vger.kernel.org
@@ -4239,7 +4247,7 @@ S:        Maintained
 F:     drivers/media/rc/iguanair.c
 
 IIO SUBSYSTEM AND DRIVERS
-M:     Jonathan Cameron <jic23@cam.ac.uk>
+M:     Jonathan Cameron <jic23@kernel.org>
 L:     linux-iio@vger.kernel.org
 S:     Maintained
 F:     drivers/iio/
@@ -4776,6 +4784,13 @@ S:       Maintained
 F:     Documentation/hwmon/k8temp
 F:     drivers/hwmon/k8temp.c
 
+KTAP
+M:     Jovi Zhangwei <jovi.zhangwei@gmail.com>
+W:     http://www.ktap.org
+L:     ktap@freelists.org
+S:     Maintained
+F:     drivers/staging/ktap/
+
 KCONFIG
 M:     Michal Marek <mmarek@suse.cz>
 L:     linux-kbuild@vger.kernel.org
@@ -8026,7 +8041,7 @@ S:        Maintained
 F:     drivers/staging/media/go7007/
 
 STAGING - INDUSTRIAL IO
-M:     Jonathan Cameron <jic23@cam.ac.uk>
+M:     Jonathan Cameron <jic23@kernel.org>
 L:     linux-iio@vger.kernel.org
 S:     Odd Fixes
 F:     drivers/staging/iio/