]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 18 Dec 2015 02:47:33 +0000 (18:47 -0800)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 18 Dec 2015 02:47:33 +0000 (18:47 -0800)
* 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com/linux-uek:
  KEYS: Fix crash when attempt to garbage collect an uninstantiated keyring
  KEYS: Fix race between key destruction and finding a keyring by name


Trivial merge