Merge commit 'v3.5-rc2' into next

author James Morris <james.l.morris@oracle.com>

Sun, 10 Jun 2012 12:52:10 +0000 (22:52 +1000)

committer James Morris <james.l.morris@oracle.com>

Sun, 10 Jun 2012 12:52:10 +0000 (22:52 +1000)
author James Morris <james.l.morris@oracle.com>
Sun, 10 Jun 2012 12:52:10 +0000 (22:52 +1000)
committer James Morris <james.l.morris@oracle.com>
Sun, 10 Jun 2012 12:52:10 +0000 (22:52 +1000)
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
author	James Morris <james.l.morris@oracle.com>
	Sun, 10 Jun 2012 12:52:10 +0000 (22:52 +1000)
committer	James Morris <james.l.morris@oracle.com>
	Sun, 10 Jun 2012 12:52:10 +0000 (22:52 +1000)
		1	2
lib/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
security/keys/compat.c	patch \|	diff1 \|	diff2 \|	blob \| history
security/keys/internal.h	patch \|	diff1 \|	diff2 \|	blob \| history
security/keys/keyctl.c	patch \|	diff1 \|	diff2 \|	blob \| history