diff options
author | Maxime Ripard <maxime.ripard@bootlin.com> | 2019-02-19 11:17:05 +0100 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@bootlin.com> | 2019-02-19 11:17:05 +0100 |
commit | ae6ba10d5090fc7e9095eaef3dcf06ba016725a6 (patch) | |
tree | e631eaa2df52712783acc4d757841da4890c4143 /arch/arm64/kernel/setup.c | |
parent | e6049cf122d1568d8000c7f5bd52c99de07ecc65 (diff) | |
parent | c06de56121e3ac0f0f1f4a081c041654ffcacd62 (diff) | |
download | linux-ae6ba10d5090fc7e9095eaef3dcf06ba016725a6.tar.gz linux-ae6ba10d5090fc7e9095eaef3dcf06ba016725a6.tar.bz2 linux-ae6ba10d5090fc7e9095eaef3dcf06ba016725a6.zip |
Merge drm/drm-next into drm-misc-next
Backmerge drm-next to bring in -rc7
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Diffstat (limited to 'arch/arm64/kernel/setup.c')
-rw-r--r-- | arch/arm64/kernel/setup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 4b0e1231625c..d09ec76f08cf 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -313,7 +313,6 @@ void __init setup_arch(char **cmdline_p) arm64_memblock_init(); paging_init(); - efi_apply_persistent_mem_reservations(); acpi_table_upgrade(); |