From: James Morris <jmorris@namei.org>
Date: Fri, 22 May 2009 08:40:59 +0000 (+1000)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.6.31-rc1~395^2^2~15
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=2c9e703c618106f5383226fbb1f526cb11034f8a

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>
---

2c9e703c618106f5383226fbb1f526cb11034f8a