| commit | cfd230b3cfd6f72a6016fb0b319bb63fcc8206cd | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 13 10:55:29 2020 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 13 10:55:29 2020 -0700 |
| tree | ccd01d04647458e3bc0c65b50e34a17cd5571ebb | |
| parent | 56192707bd8330355d3d1746d99e808eca1999d7 [diff] | |
| parent | db227c19e68db353e4cc6c99b6bc86bb24736943 [diff] |
Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm Pull ARM fixes from Russell King: - fix for "hex" Kconfig default to use 0x0 rather than 0 to allow these to be removed from defconfigs - fix from Ard Biesheuvel for EFI HYP mode booting * tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm: ARM: 8985/1: efi/decompressor: deal with HYP mode boot gracefully ARM: 8984/1: Kconfig: set default ZBOOT_ROM_TEXT/BSS value to 0x0