tree d3ebe03d4f97575290087843960baa01de3acd0a
parent 1d568ab068c021672d6cd7f50f92a3695a921ffb
parent 817b54aa45db03437c6d09a7693fc6926eb8e822
author James Morris <jmorris@namei.org> 1312849863 +1000
committer James Morris <jmorris@namei.org> 1312849863 +1000

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>