Merge branch 'master' into next
James Morris [Fri, 22 May 2009 08:40:59 +0000 (18:40 +1000)]
Conflicts:
fs/exec.c

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

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

1  2 
fs/exec.c
fs/hugetlbfs/inode.c
fs/namei.c
kernel/sysctl.c

diff --cc fs/exec.c
Simple merge
Simple merge
diff --cc fs/namei.c
Simple merge
diff --cc kernel/sysctl.c
Simple merge