diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 17:10:17 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 17:10:17 -0700 |
commit | b9b9df62e7fd6b5f099c24bc867100ab86e1da5a (patch) | |
tree | da1c16592dd1351d22d7904da0d532fd55a53817 /arch/arm/mach-pxa/include/mach/pxafb.h | |
parent | 5f8fe4270e53d38421ba34c428c3b58933b48e50 (diff) | |
parent | 9c2d2056647790c5034d722bd24e9d913ebca73c (diff) | |
download | blackbird-op-linux-b9b9df62e7fd6b5f099c24bc867100ab86e1da5a.tar.gz blackbird-op-linux-b9b9df62e7fd6b5f099c24bc867100ab86e1da5a.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: Prevent lower dentry from going negative during unlink
eCryptfs: Propagate vfs_read and vfs_write return codes
eCryptfs: Validate global auth tok keys
eCryptfs: Filename encryption only supports password auth tokens
eCryptfs: Check for O_RDONLY lower inodes when opening lower files
eCryptfs: Handle unrecognized tag 3 cipher codes
ecryptfs: improved dependency checking and reporting
eCryptfs: Fix lockdep-reported AB-BA mutex issue
ecryptfs: Remove unneeded locking that triggers lockdep false positives
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/pxafb.h')
0 files changed, 0 insertions, 0 deletions