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: Ubuntu-5.10.0-12.13~31718^2^2~45
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7d45ecafb6792ca68da9517969d37d910601845f;p=mirror_ubuntu-hirsute-kernel.git

Merge branch 'master' into next

Conflicts:
	include/linux/personality.h

Use Linus' version.

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

7d45ecafb6792ca68da9517969d37d910601845f