i2c: tegra: fix spelling mistake: "contoller" -> "controller"

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 00018356f4a5200bdaf22230708dccef9497fb7d..9a27a197b1f6dbfe842af7cce4a4fbdce05965df 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5034,7 +5034,6 @@ F:        lib/fault-inject.c
 
 FBTFT Framebuffer drivers
 M:     Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-M:     Noralf Trønnes <noralf@tronnes.org>
 S:     Maintained
 F:     drivers/staging/fbtft/
 
@@ -6012,9 +6011,8 @@ F:        include/linux/hsi/
 F:     include/uapi/linux/hsi/
 
 HSO 3G MODEM DRIVER
-M:     Jan Dumon <j.dumon@option.com>
-W:     http://www.pharscape.org
-S:     Maintained
+L:     linux-usb@vger.kernel.org
+S:     Orphan
 F:     drivers/net/usb/hso.c
 
 HSR NETWORK PROTOCOL
@@ -7700,6 +7698,14 @@ S:       Maintained
 F:     Documentation/hwmon/ltc4261
 F:     drivers/hwmon/ltc4261.c
 
+LTC4306 I2C MULTIPLEXER DRIVER
+M:     Michael Hennerich <michael.hennerich@analog.com>
+W:     http://ez.analog.com/community/linux-device-drivers
+L:     linux-i2c@vger.kernel.org
+S:     Supported
+F:     drivers/i2c/muxes/i2c-mux-ltc4306.c
+F:     Documentation/devicetree/bindings/i2c/i2c-mux-ltc4306.txt
+
 LTP (Linux Test Project)
 M:     Mike Frysinger <vapier@gentoo.org>
 M:     Cyril Hrubis <chrubis@suse.cz>
@@ -8309,7 +8315,6 @@ M:        Richard Leitner <richard.leitner@skidata.com>
 L:     linux-usb@vger.kernel.org
 S:     Maintained
 F:     drivers/usb/misc/usb251xb.c
-F:     include/linux/platform_data/usb251xb.h
 F:     Documentation/devicetree/bindings/usb/usb251xb.txt
 
 MICROSOFT SURFACE PRO 3 BUTTON DRIVER
@@ -10336,6 +10341,12 @@ L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/qedi/
 
+QLOGIC QL41xxx FCOE DRIVER
+M:     QLogic-Storage-Upstream@cavium.com
+L:     linux-scsi@vger.kernel.org
+S:     Supported
+F:     drivers/scsi/qedf/
+
 QNX4 FILESYSTEM
 M:     Anders Larsen <al@alarsen.net>
 W:     http://www.alarsen.net/linux/qnx4fs/