diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-17 18:27:39 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-17 18:27:39 (GMT) |
commit | e40bffaeaed9c5a26c3e5c961c3dee72c1b46558 (patch) | |
tree | 619aa9f481fbddb267dcd6f1ef454c846bdfc983 /init/main.c | |
parent | cc43adab9a5b7f3b7c320ded7dbd771aca421f1a (diff) | |
parent | dcb99fd9b08cfe1afe426af4d8d3cbc429190f15 (diff) | |
download | linux-e40bffaeaed9c5a26c3e5c961c3dee72c1b46558.tar.xz |
Merge 3.14-rc7 into staging-next
This resolves a merge issue with drivers/staging/cxt1e1/linux.c that was
fixed in a report from Stephen Rothwell
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index eb03090..9c7fd4c 100644 --- a/init/main.c +++ b/init/main.c @@ -561,7 +561,6 @@ asmlinkage void __init start_kernel(void) init_timers(); hrtimers_init(); softirq_init(); - acpi_early_init(); timekeeping_init(); time_init(); sched_clock_postinit(); @@ -613,6 +612,7 @@ asmlinkage void __init start_kernel(void) calibrate_delay(); pidmap_init(); anon_vma_init(); + acpi_early_init(); #ifdef CONFIG_X86 if (efi_enabled(EFI_RUNTIME_SERVICES)) efi_enter_virtual_mode(); |