diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-14 01:17:39 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-14 01:17:39 +0300 |
| commit | 64ae1342f8980d05c3df414a022b8123aa76c56b (patch) | |
| tree | 12b208c5811a699c18b2fc67e9a1f61d65febca2 /tools/perf/scripts/python/stackcollapse.py | |
| parent | 0bf999f9c5e74c7ecf9dafb527146601e5c848b9 (diff) | |
| parent | 2343d1529aff8b552589f622c23932035ed7a05d (diff) | |
| download | linux-64ae1342f8980d05c3df414a022b8123aa76c56b.tar.xz | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'tools/perf/scripts/python/stackcollapse.py')
0 files changed, 0 insertions, 0 deletions