James Morris 2c9e703c61 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>		2009-05-22 18:40:59 +10:00
..
Makefile	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
inode.c	Merge branch 'master' into next	2009-05-22 18:40:59 +10:00