summaryrefslogtreecommitdiffstats
path: root/crypto/salsa20_generic.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2017-06-04 15:21:52 +0200
committerThomas Gleixner <tglx@linutronix.de>2017-06-04 15:21:52 +0200
commit978267b6430c07d62cb38f83e058a3132c52eca1 (patch)
tree1a744c8230cd5a72adc363ca93458a748c664abe /crypto/salsa20_generic.c
parent6bc51cbaa9d75c7c240282da5ff270815caccac0 (diff)
parentff86bf0c65f14346bf2440534f9ba5ac232c39a0 (diff)
downloadop-kernel-dev-978267b6430c07d62cb38f83e058a3132c52eca1.zip
op-kernel-dev-978267b6430c07d62cb38f83e058a3132c52eca1.tar.gz
Merge branch 'timers/urgent' into WIP.timers
Pick up urgent fixes to avoid conflicts.
Diffstat (limited to 'crypto/salsa20_generic.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud