diff options
| author | David S. Miller <davem@davemloft.net> | 2014-11-29 23:47:48 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-29 23:47:48 -0500 |
| commit | 60b7379dc5b1743427b031cca53e30860a38ada6 (patch) | |
| tree | c0462b8dd188861bd04f36dd31672b7446e35dd8 /MAINTAINERS | |
| parent | a523a5ecc8c6ddceb8f783f600605553e5ad8963 (diff) | |
| parent | 7a5a4f978750756755dc839014e13d1b088ccc8e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a545d68af54c..6b880deae3d2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -6908,11 +6908,12 @@ F: drivers/scsi/osd/ | |||
| 6908 | F: include/scsi/osd_* | 6908 | F: include/scsi/osd_* |
| 6909 | F: fs/exofs/ | 6909 | F: fs/exofs/ |
| 6910 | 6910 | ||
| 6911 | OVERLAYFS FILESYSTEM | 6911 | OVERLAY FILESYSTEM |
| 6912 | M: Miklos Szeredi <miklos@szeredi.hu> | 6912 | M: Miklos Szeredi <miklos@szeredi.hu> |
| 6913 | L: linux-fsdevel@vger.kernel.org | 6913 | L: linux-unionfs@vger.kernel.org |
| 6914 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git | ||
| 6914 | S: Supported | 6915 | S: Supported |
| 6915 | F: fs/overlayfs/* | 6916 | F: fs/overlayfs/ |
| 6916 | F: Documentation/filesystems/overlayfs.txt | 6917 | F: Documentation/filesystems/overlayfs.txt |
| 6917 | 6918 | ||
| 6918 | P54 WIRELESS DRIVER | 6919 | P54 WIRELESS DRIVER |