diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 22:07:50 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 22:07:50 +0400 |
| commit | aaab184276a6e20834f63735d433f94ef52a0497 (patch) | |
| tree | 89469029763d1fe713960200ac16014fef7c2167 /net/atm | |
| parent | e52e713ec30a31e9a4663d9aebbaae5ec07466a6 (diff) | |
| parent | a058bfbbeca576cf7c93ac4f16092f13f414434e (diff) | |
| download | linux-aaab184276a6e20834f63735d433f94ef52a0497.tar.xz | |
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 'net/atm')
0 files changed, 0 insertions, 0 deletions