tree a98b1074e5577e66a97963745f975404d0aac266
parent be940d6279c30a2d7c4e8d1d5435f957f594d66d
parent 7638d5322bd89d49e013a03fe2afaeb6d214fabd
author James Morris <jmorris@namei.org> 1247495440 +1000
committer James Morris <jmorris@namei.org> 1247495440 +1000

Merge branch 'master' into next

Conflicts:
	include/linux/personality.h

Use Linus' version.

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