Merge tag 'keys-next-fixes-20140916' into keys-next
authorDavid Howells <dhowells@redhat.com>
Tue, 16 Sep 2014 16:32:55 +0000 (17:32 +0100)
committerDavid Howells <dhowells@redhat.com>
Tue, 16 Sep 2014 16:32:55 +0000 (17:32 +0100)
commit1c9c115ccc76d313f1a9232ffb903de325b64943
treea0e106355ed4f401be0a33fb115dc675f54a3766
parent68c45c7feaf1a8adebc6d9d77aa0a2018d974085
parent15155b9a4530f8da42d6594927928e25b2b29875
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 <dhowells@redhat.com>