aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2019-01-02 10:37:05 +0000
committerRussell King <rmk+kernel@armlinux.org.uk>2019-01-02 10:37:05 +0000
commit97b6f89f7269b746b68e7985c16d2354c688d29a (patch)
treedb5d1702f024c954a15321f29382a431af48dd57 /arch
parent344eb5539abf3e0b6ce22568c03e86450073e097 (diff)
parent039bc3b7f29f79a27155182865be538ce367aae0 (diff)
parentd6951f582cc50ba0ad22ef46b599740966599b14 (diff)
downloadlinux-97b6f89f7269b746b68e7985c16d2354c688d29a.tar.gz
Merge branches 'misc', 'sa1100-for-next' and 'spectre' into for-linus