diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-07 11:18:28 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-07 11:18:28 -0800 |
commit | 6339204ecc2aa2067a99595522de0403f0854bb8 (patch) | |
tree | 02665f55428bf646722cdc59750d2c2dee0595d1 /mm/swap.c | |
parent | 80e1e823989ec44d8e35bdfddadbddcffec90424 (diff) | |
parent | 89068c576bf324ef6fbd50dfc745148f7def202c (diff) | |
download | blackbird-op-linux-6339204ecc2aa2067a99595522de0403f0854bb8.tar.gz blackbird-op-linux-6339204ecc2aa2067a99595522de0403f0854bb8.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
Take ima_file_free() to proper place.
ima: rename PATH_CHECK to FILE_CHECK
ima: rename ima_path_check to ima_file_check
ima: initialize ima before inodes can be allocated
fix ima breakage
Take ima_path_check() in nfsd past dentry_open() in nfsd_open()
freeze_bdev: don't deactivate successfully frozen MS_RDONLY sb
befs: fix leak
Diffstat (limited to 'mm/swap.c')
0 files changed, 0 insertions, 0 deletions