Merge branch 'master' into next
James Morris [Mon, 13 Jul 2009 14:30:40 +0000 (00:30 +1000)]
Conflicts:
include/linux/personality.h

Use Linus' version.

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

1  2 
kernel/ptrace.c

diff --cc kernel/ptrace.c
Simple merge