Merge branch 'acpi-lpss'

* acpi-lpss:
  ACPI / platform: create LPSS clocks if Lynxpoint devices are found during scan
  clk: x86: add support for Lynxpoint LPSS clocks
  x86: add support for Intel Low Power Subsystem
  ACPI / platform: fix comment about the platform device name
  ACPI: add support for CSRT table

diff --cc arch/x86/Kconfig
Simple merge

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

diff --cc drivers/acpi/scan.c
index cbf6e77,fe171aa..c435871
--- 1/drivers/acpi/scan.c
--- 2/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@ -1716,7 -1699,9 +1718,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.