]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptf...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Jul 2011 06:43:50 +0000 (23:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Jul 2011 06:43:50 +0000 (23:43 -0700)
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
  ecryptfs: Make inode bdi consistent with superblock bdi
  eCryptfs: Unlock keys needed by ecryptfsd


Trivial merge