From: James Morris <jmorris@namei.org>
Date: Thu, 6 May 2010 12:21:04 +0000 (+1000)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.6.35-rc1~488^2^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=043b4d40f53131c5f72eca2a46555fe35328a930;p=pandora-kernel.git

Merge branch 'master' into next

Conflicts:
	security/keys/keyring.c

Resolved conflict with whitespace fix in find_keyring_by_name()

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

043b4d40f53131c5f72eca2a46555fe35328a930
Reading git-diff-tree failed