projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c103b21 5057975)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Dec 2014 17:52:49 +0000 (09:52 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Dec 2014 17:52:49 +0000 (09:52 -0800)
commit5f5425ef55b3fd2d395fb917edde3e6ae438c29a
tree7bb9076fdc62d1a8e1022734136d041872c53534tree | snapshot
parentc103b21c20ee3d173ccccb7d5ca8f5b8bc02cac3commit | diff
parent5057975ae38452679b964f1382c5efcb9faee74ecommit | diff
Merge branch 'for-linus' of git://git./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
John Crispins staging tree