From: James Morris <jmorris@namei.org>
Date: Mon, 9 Jan 2012 01:16:48 +0000 (+1100)
Subject: Merge branch 'next' into for-linus
X-Git-Tag: v3.3-rc1~105^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fcc99549522fc7a0bbaeb5755855ab0d9a59ce8;p=pandora-kernel.git

Merge branch 'next' into for-linus

Conflicts:
	security/integrity/evm/evm_crypto.c

Resolved upstream fix vs. next conflict manually.

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

8fcc99549522fc7a0bbaeb5755855ab0d9a59ce8
Reading git-diff-tree failed