diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-17 18:52:49 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-17 18:52:49 +0100 |
| commit | 5f5425ef55b3fd2d395fb917edde3e6ae438c29a (patch) | |
| tree | 7bb9076fdc62d1a8e1022734136d041872c53534 /net/rose | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/msz... (diff) | |
| parent | KEYS: remove a bogus NULL check (diff) | |
| download | linux-5f5425ef55b3fd2d395fb917edde3e6ae438c29a.tar.xz linux-5f5425ef55b3fd2d395fb917edde3e6ae438c29a.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security subsystem fixes from James Morris.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
KEYS: remove a bogus NULL check
ima: Fix build failure on powerpc when TCG_IBMVTPM dependencies are not met
KEYS: Fix stale key registration at error path
Diffstat (limited to 'net/rose')
0 files changed, 0 insertions, 0 deletions