git.stricted.de - GitHub/exynos8895/android_kernel_samsung_universal8895.git/commit

projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6470c07 5805977)

author	James Morris <jmorris@namei.org>
	Fri, 22 May 2009 08:40:59 +0000 (18:40 +1000)
committer	James Morris <jmorris@namei.org>
	Fri, 22 May 2009 08:40:59 +0000 (18:40 +1000)
commit	2c9e703c618106f5383226fbb1f526cb11034f8a
tree	87d7548001ea82f655fede0640466fc16aabcdf7	tree \| snapshot (tar.gz zip)
parent	6470c077cae12227318f40f3e6d756caadcce4b0	commit \| diff
parent	5805977e63a36ad56594a623f3bd2bebcb7db233	commit \| diff

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>

fs/exec.c	diff1 \|	diff2 \|	blob \| history
fs/hugetlbfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/namei.c	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	diff1 \|	diff2 \|	blob \| history