Merge tag 'mfd-3.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

[~andy/linux] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6f90c64a25399033da03b1c7565622565339634c..cc710d2ef009af4d544fefb1c2af9b3c24e0d2cc 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3382,6 +3382,12 @@ W:       http://www.developer.ibm.com/welcome/netfinity/serveraid.html
 S:     Supported
 F:     drivers/scsi/ips.*
 
+ICH LPC AND GPIO DRIVER
+M:     Peter Tyser <ptyser@xes-inc.com>
+S:     Maintained
+F:     drivers/mfd/lpc_ich.c
+F:     drivers/gpio/gpio-ich.c
+
 IDE SUBSYSTEM
 M:     "David S. Miller" <davem@davemloft.net>
 L:     linux-ide@vger.kernel.org