diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2018-06-05 11:03:27 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2018-06-05 11:03:27 +0200 |
commit | 0ac000e86703dedea1000513dbb8a64d02930668 (patch) | |
tree | c21658c704c9dcdcb2dc18863ab60312885a6b90 /crypto/testmgr.c | |
parent | ARM: fix kill( ,SIGFPE) breakage (diff) | |
parent | ARM: 8774/1: remove no-op macro VMLINUX_SYMBOL() (diff) | |
parent | ARM: spectre-v1: fix syscall entry (diff) | |
download | linux-0ac000e86703dedea1000513dbb8a64d02930668.tar.xz linux-0ac000e86703dedea1000513dbb8a64d02930668.zip |
Merge branches 'fixes', 'misc' and 'spectre' into for-linus