Merge branch 'for-upstream' of git://openrisc.net/jonas/linux

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 81cf5fb..43392c9 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -534,6 +534,8 @@ L:  device-drivers-devel@blackfin.uclinux.org
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 W:     http://wiki.analog.com/
 S:     Supported
+F:     sound/soc/codecs/adau*
+F:     sound/soc/codecs/adav*
 F:     sound/soc/codecs/ad1*
 F:     sound/soc/codecs/ssm*
 
@@ -1551,6 +1553,12 @@ L:       linux-wireless@vger.kernel.org
 S:     Supported
 F:     drivers/staging/brcm80211/
 
+BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
+M:     Bhanu Prakash Gollapudi <bprakash@broadcom.com>
+L:     linux-scsi@vger.kernel.org
+S:     Supported
+F:     drivers/scsi/bnx2fc/
+
 BROCADE BFA FC SCSI DRIVER
 M:     Jing Huang <huangj@brocade.com>
 L:     linux-scsi@vger.kernel.org
@@ -1773,7 +1781,8 @@ F:        include/linux/clk.h
 
 CISCO FCOE HBA DRIVER
 M:     Abhijeet Joglekar <abjoglek@cisco.com>
-M:     Joe Eykholt <jeykholt@cisco.com>
+M:     Venkata Siva Vijayendra Bhamidipati <vbhamidi@cisco.com>
+M:     Brian Uchino <buchino@cisco.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/fnic/
@@ -3426,10 +3435,9 @@ S:       Maintained
 F:     drivers/net/ipg.*
 
 IPATH DRIVER
-M:     Ralph Campbell <infinipath@qlogic.com>
+M:     Mike Marciniszyn <infinipath@qlogic.com>
 L:     linux-rdma@vger.kernel.org
-T:     git git://git.qlogic.com/ipath-linux-2.6
-S:     Supported
+S:     Maintained
 F:     drivers/infiniband/hw/ipath/
 
 IPMI SUBSYSTEM
@@ -4680,6 +4688,14 @@ F:       drivers/of
 F:     include/linux/of*.h
 K:     of_get_property
 
+OPENRISC ARCHITECTURE
+M:     Jonas Bonn <jonas@southpole.se>
+W:     http://openrisc.net
+L:     linux@lists.openrisc.net
+S:     Maintained
+T:     git git://openrisc.net/~jonas/linux
+F:     arch/openrisc
+
 OPL4 DRIVER
 M:     Clemens Ladisch <clemens@ladisch.de>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -5152,6 +5168,12 @@ M:       Robert Jarzmik <robert.jarzmik@free.fr>
 L:     rtc-linux@googlegroups.com
 S:     Maintained
 
+QIB DRIVER
+M:     Mike Marciniszyn <infinipath@qlogic.com>
+L:     linux-rdma@vger.kernel.org
+S:     Supported
+F:     drivers/infiniband/hw/qib/
+
 QLOGIC QLA1280 SCSI DRIVER
 M:     Michael Reed <mdr@sgi.com>
 L:     linux-scsi@vger.kernel.org
@@ -5313,6 +5335,13 @@ L:       reiserfs-devel@vger.kernel.org
 S:     Supported
 F:     fs/reiserfs/
 
+REGISTER MAP ABSTRACTION
+M:     Mark Brown <broonie@opensource.wolfsonmicro.com>
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
+S:     Supported
+F:     drivers/base/regmap/
+F:     include/linux/regmap.h
+
 RFKILL
 M:     Johannes Berg <johannes@sipsolutions.net>
 L:     linux-wireless@vger.kernel.org