Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-01-01 15:51:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
5a2f3a02ae
linux/security/integrity/ima
History
James Morris 5a2f3a02ae Merge branch 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima-2.6 into next 
Conflicts:
	fs/attr.c

Resolve conflict manually.

Signed-off-by: James Morris <jmorris@namei.org>
2011-08-09 10:31:03 +10:00
..
ima_api.c integrity: move ima inode integrity data management 2011-07-18 12:29:38 -04:00
ima_audit.c Merge branch 'master' into next 2010-05-06 10:56:07 +10:00
ima_crypto.c Merge branch 'master' into next 2010-05-06 10:56:07 +10:00
ima_fs.c ima: use generic_file_llseek for securityfs 2010-08-02 15:34:58 +10:00
ima_init.c Merge branch 'master' into next 2010-05-06 10:56:07 +10:00
ima_main.c Merge branch 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima-2.6 into next 2011-08-09 10:31:03 +10:00
ima_policy.c ima: fix add LSM rule bug 2011-01-03 16:36:33 -08:00
ima_queue.c Merge branch 'master' into next 2010-05-06 10:56:07 +10:00
ima.h integrity: move ima inode integrity data management 2011-07-18 12:29:38 -04:00
Kconfig integrity: move ima inode integrity data management 2011-07-18 12:29:38 -04:00
Makefile integrity: move ima inode integrity data management 2011-07-18 12:29:38 -04:00