diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-10-07 15:35:29 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-10-07 15:35:29 +1100 |
| commit | 3783506087dcf3bd545e9bee5afcc69a61ae9184 (patch) | |
| tree | b60f0cd530447cc87f1d14c428a0e87a7eff9e92 /MAINTAINERS | |
| parent | 611edd894ff42c433320c7f328a43e978a07a063 (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 357a4c70fd27..0b201991dda5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7410,6 +7410,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> |