From: James Morris <jmorris@namei.org>
Date: Thu, 19 May 2011 08:51:57 +0000 (+1000)
Subject: Merge branch 'master' into next
X-Git-Tag: v3.0-rc1~309^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12a5a2621b1ee14d32beca35304d7c6076a58815;p=pandora-kernel.git

Merge branch 'master' into next

Conflicts:
	include/linux/capability.h

Manually resolve merge conflict w/ thanks to Stephen Rothwell.

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

12a5a2621b1ee14d32beca35304d7c6076a58815
Reading git-diff-tree failed