From: Linus Torvalds Date: Tue, 27 Apr 2010 23:26:46 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=1600f9def09de07c5dbeb539e978fa73880690dd;p=linux-edison.git Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/security-testing-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: keys: don't need to use RCU in keyring_read() as semaphore is held --- 1600f9def09de07c5dbeb539e978fa73880690dd