diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 11:07:50 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 11:07:50 -0700 |
commit | aaab184276a6e20834f63735d433f94ef52a0497 (patch) | |
tree | 89469029763d1fe713960200ac16014fef7c2167 /MAINTAINERS | |
parent | e52e713ec30a31e9a4663d9aebbaae5ec07466a6 (diff) | |
parent | a058bfbbeca576cf7c93ac4f16092f13f414434e (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
MAINTAINERS: Update eCryptfs mailing list
eCryptfs: Allow 2 scatterlist entries for encrypted filenames
eCryptfs: Clear i_nlink in rmdir
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a6562ba1dc35..a33b11560d3f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2304,7 +2304,7 @@ F: net/bridge/netfilter/ebt*.c ECRYPT FILE SYSTEM M: Tyler Hicks <tyhicks@linux.vnet.ibm.com> M: Dustin Kirkland <kirkland@canonical.com> -L: ecryptfs-devel@lists.launchpad.net +L: ecryptfs@vger.kernel.org W: https://launchpad.net/ecryptfs S: Supported F: Documentation/filesystems/ecryptfs.txt |