Merge tag 'v3.12-rc4' into devel

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 8a0cbf3cf2c8c01c5be662eef372eff4060daffc..7534a8042f065b9009e9ee8904f7a15f738b107e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1910,6 +1910,12 @@ W:       http://bu3sch.de/btgpio.php
 S:     Maintained
 F:     drivers/gpio/gpio-bt8xx.c
 
+INTEL-MID GPIO DRIVER
+M:     David Cohen <david.a.cohen@linux.intel.com>
+L:     linux-gpio@vger.kernel.org
+S:     Maintained
+F:     drivers/gpio/gpio-intel-mid.c
+
 BTRFS FILE SYSTEM
 M:     Chris Mason <chris.mason@fusionio.com>
 L:     linux-btrfs@vger.kernel.org