diff --git a/[refs] b/[refs] index c9a3d6a745f1..3d63de6d67d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c835670ab5f72a4ea2d0db232b1acc07924f186 +refs/heads/master: 14816b1e2b0eb24ef41dbe37dcb558338e54a603 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 6b30cb3eac78..ac425b5b4a40 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2110,6 +2110,14 @@ L: irda-users@lists.sourceforge.net (subscribers-only) W: http://irda.sourceforge.net/ S: Maintained +ISCSI +P: Mike Christie +M: michaelc@cs.wisc.edu +L: open-iscsi@googlegroups.com +W: www.open-iscsi.org +T: git kernel.org:/pub/scm/linux/kernel/mnc/linux-2.6-iscsi.git +S: Maintained + ISAPNP P: Jaroslav Kysela M: perex@perex.cz