git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1d568ab 817b54a)

author	James Morris <jmorris@namei.org>
	Tue, 9 Aug 2011 00:31:03 +0000 (10:31 +1000)
committer	James Morris <jmorris@namei.org>
	Tue, 9 Aug 2011 00:31:03 +0000 (10:31 +1000)
commit	5a2f3a02aea164f4f59c0c3497772090a411b462
tree	d3ebe03d4f97575290087843960baa01de3acd0a	tree \| snapshot
parent	1d568ab068c021672d6cd7f50f92a3695a921ffb	commit \| diff
parent	817b54aa45db03437c6d09a7693fc6926eb8e822	commit \| diff

Merge branch 'next-evm' of git://git./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

John Crispins staging tree