diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2019-01-02 10:37:05 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2019-01-02 10:37:05 +0000 |
commit | 97b6f89f7269b746b68e7985c16d2354c688d29a (patch) | |
tree | db5d1702f024c954a15321f29382a431af48dd57 /arch/arm/mach-pxa/Kconfig | |
parent | 344eb5539abf3e0b6ce22568c03e86450073e097 (diff) | |
parent | 039bc3b7f29f79a27155182865be538ce367aae0 (diff) | |
parent | d6951f582cc50ba0ad22ef46b599740966599b14 (diff) | |
download | linux-97b6f89f7269b746b68e7985c16d2354c688d29a.tar.bz2 |
Merge branches 'misc', 'sa1100-for-next' and 'spectre' into for-linus