Merge branch 'linus' into sfi-release

Conflicts:
	arch/x86/kernel/setup.c
	drivers/acpi/power.c
	init/main.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 7e62d1eb8e30..67e929b89875 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1079,9 +1079,8 @@ static int __init acpi_parse_madt_ioapic_entries(void)
          * If MPS is present, it will handle them,
          * otherwise the system will stay in PIC mode
          */
-        if (acpi_disabled || acpi_noirq) {
+        if (acpi_disabled || acpi_noirq)
                 return -ENODEV;
-        }
 
         if (!cpu_has_apic)
                 return -ENODEV;