Merge branch 'acpica' into acpi-lpss

The following commits depend on the 'acpica' material.

diff --combined include/linux/acpi.h
index 8c1d6f2a2193973ea524d205fb57b13fc46f87b5,6b795bd36383368955925437e7a8a8685356b444..1e33ea00485aa5de73468d3f653b3bb4924fa221
--- 1/include/linux/acpi.h
--- 2/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@@ -74,9 -74,10 +74,10 @@@ enum acpi_address_range_id 
  
  /* Table Handlers */
  
- typedef int (*acpi_table_handler) (struct acpi_table_header *table);
+ typedef int (*acpi_tbl_table_handler)(struct acpi_table_header *table);
  
- typedef int (*acpi_table_entry_handler) (struct acpi_subtable_header *header, const unsigned long end);
+ typedef int (*acpi_tbl_entry_handler)(struct acpi_subtable_header *header,
+                                     const unsigned long end);
  
  #ifdef CONFIG_ACPI_INITRD_TABLE_OVERRIDE
  void acpi_initrd_override(void *data, size_t size);
@@@ -95,10 -96,14 +96,14 @@@ int acpi_mps_check (void)
  int acpi_numa_init (void);
  
  int acpi_table_init (void);
- int acpi_table_parse (char *id, acpi_table_handler handler);
+ int acpi_table_parse(char *id, acpi_tbl_table_handler handler);
  int __init acpi_table_parse_entries(char *id, unsigned long table_size,
-       int entry_id, acpi_table_entry_handler handler, unsigned int max_entries);
- int acpi_table_parse_madt (enum acpi_madt_type id, acpi_table_entry_handler handler, unsigned int max_entries);
+                                   int entry_id,
+                                   acpi_tbl_entry_handler handler,
+                                   unsigned int max_entries);
+ int acpi_table_parse_madt(enum acpi_madt_type id,
+                         acpi_tbl_entry_handler handler,
+                         unsigned int max_entries);
  int acpi_parse_mcfg (struct acpi_table_header *header);
  void acpi_table_print_madt_entry (struct acpi_subtable_header *madt);
  
@@@ -526,14 -531,9 +531,14 @@@ static inline int acpi_subsys_resume_ea
  #endif
  
  #if defined(CONFIG_ACPI) && defined(CONFIG_PM)
 +struct acpi_device *acpi_dev_pm_get_node(struct device *dev);
  int acpi_dev_pm_attach(struct device *dev, bool power_on);
  void acpi_dev_pm_detach(struct device *dev, bool power_off);
  #else
 +static inline struct acpi_device *acpi_dev_pm_get_node(struct device *dev)
 +{
 +      return NULL;
 +}
  static inline int acpi_dev_pm_attach(struct device *dev, bool power_on)
  {
        return -ENODEV;