Skip to content
Commit 7d45ecaf authored by James Morris's avatar James Morris
Browse files

Merge branch 'master' into next



Conflicts:
	include/linux/personality.h

Use Linus' version.

Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parents be940d62 7638d532
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment