diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-10-12 18:32:27 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-10-12 18:32:27 +1100 |
| commit | f645560602a5277ca2e2c2b9be27e3ad102a2c7c (patch) | |
| tree | 1ac8be100c1992b2ae6c1bc41d3f7196c1e86813 /MAINTAINERS | |
| parent | ae67913a1dd02fcf776f5c00b3ae7d830ad5fa89 (diff) | |
| parent | c3a0c7301db7c3797655cf114e67f4162830c370 (diff) | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ed0693656a08..e555e55bbacb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7418,6 +7418,7 @@ S: Supported F: Documentation/filesystems/nilfs2.txt F: fs/nilfs2/ F: include/linux/nilfs2_fs.h +F: include/trace/events/nilfs2.h NINJA SCSI-3 / NINJA SCSI-32Bi (16bit/CardBus) PCMCIA SCSI HOST ADAPTER DRIVER M: YOKOTA Hiroshi <yokota@netlab.is.tsukuba.ac.jp> |