summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-27 11:07:50 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-27 11:07:50 -0700
commitaaab184276a6e20834f63735d433f94ef52a0497 (patch)
tree89469029763d1fe713960200ac16014fef7c2167 /include/linux
parente52e713ec30a31e9a4663d9aebbaae5ec07466a6 (diff)
parenta058bfbbeca576cf7c93ac4f16092f13f414434e (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 'include/linux')
0 files changed, 0 insertions, 0 deletions