diff options
| author | James Morris <jmorris@namei.org> | 2011-08-09 10:31:03 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-08-09 10:31:03 +1000 |
| commit | 5a2f3a02aea164f4f59c0c3497772090a411b462 (patch) | |
| tree | d3ebe03d4f97575290087843960baa01de3acd0a /include/linux/nfs2.h | |
| parent | 1d568ab068c021672d6cd7f50f92a3695a921ffb (diff) | |
| parent | 817b54aa45db03437c6d09a7693fc6926eb8e822 (diff) | |
| download | blackbird-op-linux-5a2f3a02aea164f4f59c0c3497772090a411b462.tar.gz blackbird-op-linux-5a2f3a02aea164f4f59c0c3497772090a411b462.zip | |
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>
Diffstat (limited to 'include/linux/nfs2.h')
0 files changed, 0 insertions, 0 deletions
