projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 68c45c7 15155b9)
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)
Merge in keyrings fixes for next:

 (1) Insert some missing 'static' annotations.

Signed-off-by: David Howells <dhowells@redhat.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.