From: James Morris <jmorris@namei.org>
Date: Mon, 13 Jul 2009 14:30:40 +0000 (+1000)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.6.32-rc1~737^2^2~45
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7d45ecafb6792ca68da9517969d37d910601845f;p=users%2Fdwmw2%2Flinux.git

Merge branch 'master' into next

Conflicts:
	include/linux/personality.h

Use Linus' version.

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

7d45ecafb6792ca68da9517969d37d910601845f