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)
commit74aec4e0dd93d4202d3d5a692723f39cc5332b15
tree33affbfd65e4a1bfe3b27df6bd91baa2dfb593f7
parentc32e7d669ef827f97d1aae8f6b34542665defbf6
parent985ca0e626e195ea08a1a82b8dbeb6719747429a
Merge branch 'next' of git://git./linux/kernel/git/ecryptfs/ecryptfs-2.6

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