From: David Howells Date: Tue, 16 Sep 2014 16:32:55 +0000 (+0100) Subject: Merge tag 'keys-next-fixes-20140916' into keys-next X-Git-Tag: v3.18-rc1~77^2~10^2~2 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1c9c115ccc76d313f1a9232ffb903de325b64943;p=linux-block.git Merge tag 'keys-next-fixes-20140916' into keys-next Merge in keyrings fixes for next: (1) Insert some missing 'static' annotations. Signed-off-by: David Howells --- 1c9c115ccc76d313f1a9232ffb903de325b64943