]> 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)
commitc82b2161a27592657ea05bb9ad3e193640ec5654
tree89469029763d1fe713960200ac16014fef7c2167
parent5b363f7d0d91e18f5c15ae8d0ee698b9fd93bee9
parent94715af6ac62ccc63e49dd5211e7056a154a8227
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