git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6470c07 5805977)
Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Fri, 22 May 2009 08:40:59 +0000 (18:40 +1000)
committerJames Morris <jmorris@namei.org>
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>

Trivial merge
Pandora Kernel Repository