diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2018-03-24 09:21:47 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-24 09:21:47 +0100 |
| commit | 7054e4e0b165ba74562adef96a6b1c53fb9600a4 (patch) | |
| tree | 4b0a313a032f0522d277ed8d8bac63d0dc2e9a94 /crypto/algapi.c | |
| parent | Merge branch 'perf/urgent' into perf/core, to resolve conflicts (diff) | |
| parent | perf/cgroup: Fix child event counting bug (diff) | |
| download | linux-rng-7054e4e0b165ba74562adef96a6b1c53fb9600a4.tar.xz linux-rng-7054e4e0b165ba74562adef96a6b1c53fb9600a4.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
With the cherry-picked perf/urgent commit merged separately we can now
merge all the fixes without conflicts.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'crypto/algapi.c')
0 files changed, 0 insertions, 0 deletions