tree 87d7548001ea82f655fede0640466fc16aabcdf7
parent 6470c077cae12227318f40f3e6d756caadcce4b0
parent 5805977e63a36ad56594a623f3bd2bebcb7db233
author James Morris <jmorris@namei.org> 1242981659 +1000
committer James Morris <jmorris@namei.org> 1242981659 +1000

Merge branch 'master' into next

Conflicts:
	fs/exec.c

Removed IMA changes (the IMA checks are now performed via may_open()).

Signed-off-by: James Morris <jmorris@namei.org>