Merge commit 'v3.5-rc2' into next
James Morris [Sun, 10 Jun 2012 12:52:10 +0000 (22:52 +1000)]
1  2 
lib/Kconfig
security/keys/compat.c
security/keys/internal.h
security/keys/keyctl.c

diff --cc lib/Kconfig
Simple merge
Simple merge
Simple merge
Simple merge