projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0bf999f 2343d15)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Feb 2020 22:17:39 +0000 (14:17 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Feb 2020 22:17:39 +0000 (14:17 -0800)
commit64ae1342f8980d05c3df414a022b8123aa76c56b
tree12b208c5811a699c18b2fc67e9a1f61d65febca2tree | snapshot
parent0bf999f9c5e74c7ecf9dafb527146601e5c848b9commit | diff
parent2343d1529aff8b552589f622c23932035ed7a05dcommit | diff
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "This fixes a Kconfig anomaly when lib/crypto is enabled without Crypto
  API"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: Kconfig - allow tests to be disabled when manager is disabled
John Crispins staging tree