]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 94c30bb 73a0410)
Merge branch 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima...
authorJames Morris <jmorris@namei.org>
Tue, 9 Aug 2011 00:31:03 +0000 (10:31 +1000)
committerJames Morris <jmorris@namei.org>
Tue, 9 Aug 2011 00:31:03 +0000 (10:31 +1000)
commit9e308e0d017d35d746fcc8d424afa876028ef3be
treed3ebe03d4f97575290087843960baa01de3acd0atree | snapshot
parent94c30bb9c4cc510cd12cdee8c009ca1d1f6707d6commit | diff
parent73a04106fde5d3fdf121d2cef107e12ba2157990commit | diff
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>
Documentation/kernel-parameters.txt diff1 | diff2 | blob | history
fs/attr.c diff1 | diff2 | blob | history
fs/btrfs/xattr.c diff1 | diff2 | blob | history
fs/gfs2/inode.c diff1 | diff2 | blob | history
fs/jfs/xattr.c diff1 | diff2 | blob | history
fs/xfs/linux-2.6/xfs_iops.c diff1 | diff2 | blob | history
include/linux/security.h diff1 | diff2 | blob | history
mm/shmem.c diff1 | diff2 | blob | history
security/integrity/ima/ima_main.c diff1 | diff2 | blob | history
security/security.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.