git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[pandora-kernel.git]
/
MAINTAINERS
diff --git
a/MAINTAINERS
b/MAINTAINERS
index
81cf5fb
..
41ec646
100644
(file)
--- a/
MAINTAINERS
+++ b/
MAINTAINERS
@@
-3426,10
+3426,9
@@
S: Maintained
F: drivers/net/ipg.*
IPATH DRIVER
F: drivers/net/ipg.*
IPATH DRIVER
-M:
Ralph Campbell
<infinipath@qlogic.com>
+M:
Mike Marciniszyn
<infinipath@qlogic.com>
L: linux-rdma@vger.kernel.org
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
F: drivers/infiniband/hw/ipath/
IPMI SUBSYSTEM
@@
-5152,6
+5151,12
@@
M: Robert Jarzmik <robert.jarzmik@free.fr>
L: rtc-linux@googlegroups.com
S: Maintained
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
QLOGIC QLA1280 SCSI DRIVER
M: Michael Reed <mdr@sgi.com>
L: linux-scsi@vger.kernel.org