From: James Morris <jmorris@namei.org>
Date: Sun, 9 Jan 2011 22:46:24 +0000 (+1100)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.6.38-rc1~429^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2e7ad19229f982fc1eb731827d82ceac90abfb3;p=pandora-kernel.git

Merge branch 'master' into next

Conflicts:
	security/smack/smack_lsm.c

Verified and added fix by Stephen Rothwell <sfr@canb.auug.org.au>
Ok'd by Casey Schaufler <casey@schaufler-ca.com>

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

d2e7ad19229f982fc1eb731827d82ceac90abfb3
Reading git-diff-tree failed