diff --git a/[refs] b/[refs] index 0bd12b2fd7e8..a5b0083d4aba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 047180f2d7bf95ff5699ca04da639a7556e23435 +refs/heads/master: 85ef9cea02882baedd1e65336cf3dd292841dde3 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 914f283dac08..c3b215970f7b 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3244,6 +3244,13 @@ M: andi@lisas.de L: netdev@vger.kernel.org S: Maintained +NILFS2 FILESYSTEM +P: KONISHI Ryusuke +M: konishi.ryusuke@lab.ntt.co.jp +L: users@nilfs.org +W: http://www.nilfs.org/en/ +S: Supported + NINJA SCSI-3 / NINJA SCSI-32Bi (16bit/CardBus) PCMCIA SCSI HOST ADAPTER DRIVER P: YOKOTA Hiroshi M: yokota@netlab.is.tsukuba.ac.jp