Merge branch 'master' into next
Conflicts:
include/linux/personality.h
Use Linus' version.
Signed-off-by:
James Morris <jmorris@namei.org>
Loading
Please register or sign in to comment
Conflicts:
include/linux/personality.h
Use Linus' version.
Signed-off-by:
James Morris <jmorris@namei.org>