tree 89469029763d1fe713960200ac16014fef7c2167
parent e52e713ec30a31e9a4663d9aebbaae5ec07466a6
parent a058bfbbeca576cf7c93ac4f16092f13f414434e
author Linus Torvalds <torvalds@linux-foundation.org> 1306519670 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1306519670 -0700

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