diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-29 23:43:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-29 23:43:50 -0700 |
| commit | 74aec4e0dd93d4202d3d5a692723f39cc5332b15 (patch) | |
| tree | 33affbfd65e4a1bfe3b27df6bd91baa2dfb593f7 /net | |
| parent | c32e7d669ef827f97d1aae8f6b34542665defbf6 (diff) | |
| parent | 985ca0e626e195ea08a1a82b8dbeb6719747429a (diff) | |
Merge branch 'next' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions