X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=MAINTAINERS;h=1209323b7e43f372b65d0b1db48c0cfc0f6a9973;hb=617a8d6bc19edd075e8111c6770f79cae75be51f;hp=0f148d3bdae7310f4e0dd1f96d1cabf9e3b06ef9;hpb=18751e2eb51261059e51e1a7cf5aec2fd5429608;p=linux-2.6-block.git

diff --git a/MAINTAINERS b/MAINTAINERS
index 0f148d3bdae7..1209323b7e43 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7424,7 +7424,7 @@ F:	drivers/scsi/megaraid.*
 F:	drivers/scsi/megaraid/
 
 MELLANOX ETHERNET DRIVER (mlx4_en)
-M: 	Eugenia Emantayev <eugenia@mellanox.com>
+M:	Tariq Toukan <tariqt@mellanox.com>
 L:	netdev@vger.kernel.org
 S:	Supported
 W:	http://www.mellanox.com
@@ -8963,6 +8963,7 @@ L:	linux-gpio@vger.kernel.org
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
 S:	Maintained
 F:	Documentation/devicetree/bindings/pinctrl/
+F:	Documentation/pinctrl.txt
 F:	drivers/pinctrl/
 F:	include/linux/pinctrl/