Merge branches 'acpi-scan', 'acpi-osl' and 'acpi-apei'

* acpi-scan:
  ACPI / scan: AMBA bus probing support
  ACPI: introduce a function to find the first physical device

* acpi-osl:
  ACPI / OSL: Add support to install tables via initrd
  ACPI / OSL: Clean up initrd table override code

* acpi-apei:
  ACPI / APEI: ERST: Fixed leaked resources in erst_init
  ACPI / APEI: Fix leaked resources

diff --combined drivers/acpi/internal.h
index 1e6833a5cd44b6db55b5c9e376eceabfb44b30e0,9860df04b7c259ec6b12aa8abb7ebf7088d22bf3,27c2cb90e8e443de75d442e8d617c1d0611cc830,1e6833a5cd44b6db55b5c9e376eceabfb44b30e0..a37508ef66c1b544dbf2a677c7a4c7608022cd40
--- 1/drivers/acpi/internal.h
--- 2/drivers/acpi/internal.h
--- 3/drivers/acpi/internal.h
--- 4/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@@@@ -20,6 -20,6 -20,7 -20,6 +20,7 @@@@@
    
    #define PREFIX "ACPI: "
    
++ +void acpi_initrd_initialize_tables(void);
    acpi_status acpi_os_initialize1(void);
    void init_acpi_device_notify(void);
    int acpi_scan_init(void);
@@@@@ -29,6 -29,11 -30,6 -29,6 +30,11 @@@@@ void acpi_processor_init(void)
    void acpi_platform_init(void);
    void acpi_pnp_init(void);
    void acpi_int340x_thermal_init(void);
+ ++#ifdef CONFIG_ARM_AMBA
+ ++void acpi_amba_init(void);
+ ++#else
+ ++static inline void acpi_amba_init(void) {}
+ ++#endif
    int acpi_sysfs_init(void);
    void acpi_container_init(void);
    void acpi_memory_hotplug_init(void);
@@@@@ -106,6 -111,7 -107,6 -106,6 +112,7 @@@@@ bool acpi_device_is_present(struct acpi
    bool acpi_device_is_battery(struct acpi_device *adev);
    bool acpi_device_is_first_physical_node(struct acpi_device *adev,
                                        const struct device *dev);
+ ++struct device *acpi_get_first_physical_node(struct acpi_device *adev);
    
    /* --------------------------------------------------------------------------
                         Device Matching and Notification