From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 May 2011 18:07:50 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs... 
X-Git-Tag: Ubuntu-5.2.0-15.16~20621
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=aaab184276a6e20834f63735d433f94ef52a0497;p=mirror_ubuntu-eoan-kernel.git

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
---

aaab184276a6e20834f63735d433f94ef52a0497