]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 May 2011 18:07:50 +0000 (11:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 May 2011 18:07:50 +0000 (11:07 -0700)
commitd2505dc4f30f8891307b8f72d268c4b61a48ad35
tree89469029763d1fe713960200ac16014fef7c2167
parent6bf0ab797a8531e8008cc89425c861ce77d04c77
parentb82e7d8d70b62af65e62115486751a037ca30b9d
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
MAINTAINERS
fs/ecryptfs/inode.c