]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5619270 db227c1)
Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Jun 2020 17:55:29 +0000 (10:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Jun 2020 17:55:29 +0000 (10:55 -0700)
commitcfd230b3cfd6f72a6016fb0b319bb63fcc8206cd
treeccd01d04647458e3bc0c65b50e34a17cd5571ebbtree | snapshot
parent56192707bd8330355d3d1746d99e808eca1999d7commit | diff
parentdb227c19e68db353e4cc6c99b6bc86bb24736943commit | 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
Michael's Linux tree.