| commit | 5a2f3a02aea164f4f59c0c3497772090a411b462 | [log] [tgz] |
|---|---|---|
| author | James Morris <jmorris@namei.org> | Tue Aug 09 10:31:03 2011 +1000 |
| committer | James Morris <jmorris@namei.org> | Tue Aug 09 10:31:03 2011 +1000 |
| tree | d3ebe03d4f97575290087843960baa01de3acd0a | |
| parent | 1d568ab068c021672d6cd7f50f92a3695a921ffb [diff] | |
| parent | 817b54aa45db03437c6d09a7693fc6926eb8e822 [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>