Merge commit 'v3.5-rc2' into next

diff --cc lib/Kconfig
Simple merge

diff --cc security/keys/compat.c
Simple merge

diff --cc security/keys/internal.h
Simple merge

diff --cc security/keys/keyctl.c
Simple merge