diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2019-01-02 11:37:05 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2019-01-02 11:37:05 +0100 |
commit | 97b6f89f7269b746b68e7985c16d2354c688d29a (patch) | |
tree | db5d1702f024c954a15321f29382a431af48dd57 /arch/arm/mach-pxa | |
parent | ARM: 8813/1: Make aligned 2-byte getuser()/putuser() atomic on ARMv6+ (diff) | |
parent | ARM: sa1100/cerf: switch to using gpio_led_register_device() (diff) | |
parent | ARM: fix the cockup in the previous patch (diff) | |
download | linux-97b6f89f7269b746b68e7985c16d2354c688d29a.tar.xz linux-97b6f89f7269b746b68e7985c16d2354c688d29a.zip |
Merge branches 'misc', 'sa1100-for-next' and 'spectre' into for-linus