diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 15:43:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 15:43:25 -0700 |
| commit | 7f5fe3ec8eab23cc28e8fb7d23b4777ad6a05734 (patch) | |
| tree | 1c553d6a92115aea7d24d279c0bee5dc6e894902 /arch/cris/arch-v10 | |
| parent | 212a17ab878305600e607f637d2d8a49d9f7ef25 (diff) | |
| parent | b5695d04634fa4ccca7dcbc05bb4a66522f02e0b (diff) | |
| download | blackbird-op-linux-7f5fe3ec8eab23cc28e8fb7d23b4777ad6a05734.tar.gz blackbird-op-linux-7f5fe3ec8eab23cc28e8fb7d23b4777ad6a05734.zip | |
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:
eCryptfs: write lock requested keys
eCryptfs: move ecryptfs_find_auth_tok_for_sig() call before mutex_lock
eCryptfs: verify authentication tokens before their use
eCryptfs: modified size of keysig in the ecryptfs_key_sig structure
eCryptfs: removed num_global_auth_toks from ecryptfs_mount_crypt_stat
eCryptfs: ecryptfs_keyring_auth_tok_for_sig() bug fix
eCryptfs: Unlock page in write_begin error path
ecryptfs: modify write path to encrypt page in writepage
eCryptfs: Remove ECRYPTFS_NEW_FILE crypt stat flag
eCryptfs: Remove unnecessary grow_file() function
Diffstat (limited to 'arch/cris/arch-v10')
0 files changed, 0 insertions, 0 deletions
