From: James Morris <jmorris@namei.org>
Date: Tue, 9 Aug 2011 00:31:03 +0000 (+1000)
Subject: Merge branch 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima... 
X-Git-Tag: v3.2-rc1~190^2~65
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a2f3a02aea164f4f59c0c3497772090a411b462;p=pandora-kernel.git

Merge branch 'next-evm' of git://git./linux/kernel/git/zohar/ima-2.6 into next

Conflicts:
	fs/attr.c

Resolve conflict manually.

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

5a2f3a02aea164f4f59c0c3497772090a411b462
Reading git-diff-tree failed