Merge branch 'acpi-lpss' into acpi-cleanup

The following commits depend on the 'acpi-lpss' material.

diff --cc drivers/acpi/internal.h
Simple merge

diff --cc drivers/acpi/processor_idle.c
Simple merge

diff --cc drivers/acpi/scan.c
index 774b17dc7999d6623b23ae188f1cfe10cd020217,fe171aa7a98c3df20b68a638fd96daf177df1847..fe9f2c926663dede551bb47b8b53e46e0e6dc4c0
--- 1/drivers/acpi/scan.c
--- 2/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@ -1725,7 -1699,9 +1727,8 @@@ int __init acpi_scan_init(void
                printk(KERN_ERR PREFIX "Could not register bus type\n");
        }
  
 -      acpi_power_init();
        acpi_pci_root_init();
+       acpi_csrt_init();
  
        /*
         * Enumerate devices in the ACPI namespace.

diff --cc include/linux/acpi.h
Simple merge