summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-02-17 09:22:01 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-02-17 09:22:01 -0800
commit2fee036af043fa07ab19cbe8a7350fc685bd8be1 (patch)
tree2bedee3e95f4c3e7c099655a4f0c2cec97bd453b /Makefile
parent8d33316d520501f24fef180ea5b860ecb9e64506 (diff)
parent582a32e708823e5957fd73ccd78dc4a9e49d21ea (diff)
downloadlinux-sh-2fee036af043fa07ab19cbe8a7350fc685bd8be1.tar.gz
Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI fixes from Ingo Molnar: "This tree reverts a GICv3 commit (which was broken) and fixes it in another way, by adding a memblock build-time entries quirk for ARM64" * 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: efi/arm: Revert "Defer persistent reservations until after paging_init()" arm64, mm, efi: Account for GICv3 LPI tables in static memblock reserve table
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions