Merge branch 'acpi-hotplug'

* acpi-hotplug:
  ACPI / hotplug: Consolidate deferred execution of ACPI hotplug routines
  ACPI / hotplug: Do not execute "insert in progress" _OST
  ACPI / hotplug: Carry out PCI root eject directly
  ACPI / hotplug: Merge device hot-removal routines
  ACPI / hotplug: Make acpi_bus_hot_remove_device() internal
  ACPI / hotplug: Simplify device ejection routines
  ACPI / hotplug: Fix handle_root_bridge_removal()
  ACPI / hotplug: Refuse to hot-remove all objects with disabled hotplug
  ACPI / scan: Start matching drivers after trying scan handlers
  ACPI: Remove acpi_pci_slot_init() headers from internal.h

Conflicts:
	include/acpi/acpiosxf.h (with the 'acpica' branch)

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

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

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

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

diff --cc drivers/pci/hotplug/acpiphp_glue.c
Simple merge

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

diff --cc include/acpi/platform/aclinux.h
index ab57930,68534ef..28f4f4d
--- 1/include/acpi/platform/aclinux.h
--- 2/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@@ -199,53 -163,17 +199,50 @@@ static inline acpi_thread_id acpi_os_ge
   * all locks to the name of the argument of acpi_os_create_lock(), which
   * prevents lockdep from reporting false positives for ACPICA locks.
   */
 -#define acpi_os_create_lock(__handle)                         \
 -({                                                            \
 -      spinlock_t *lock = ACPI_ALLOCATE(sizeof(*lock));        \
 -                                                              \
 -      if (lock) {                                             \
 -              *(__handle) = lock;                             \
 -              spin_lock_init(*(__handle));                    \
 -      }                                                       \
 -      lock ? AE_OK : AE_NO_MEMORY;                            \
 -})
 -
 -#endif /* __KERNEL__ */
 -
 -#endif /* __ACLINUX_H__ */
 +#define acpi_os_create_lock(__handle) \
 +      ({ \
 +              spinlock_t *lock = ACPI_ALLOCATE(sizeof(*lock)); \
 +              if (lock) { \
 +                      *(__handle) = lock; \
 +                      spin_lock_init(*(__handle)); \
 +              } \
 +              lock ? AE_OK : AE_NO_MEMORY; \
 +      })
 +#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_create_lock
 +
 +void __iomem *acpi_os_map_memory(acpi_physical_address where, acpi_size length);
 +#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_map_memory
 +
 +void acpi_os_unmap_memory(void __iomem * logical_address, acpi_size size);
 +#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_unmap_memory
 +
 +/*
 + * OSL interfaces used by debugger/disassembler
 + */
 +#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_readable
 +#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_writable
 +
 +/*
 + * OSL interfaces used by utilities
 + */
 +#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_redirect_output
 +#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_line
 +#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_table_by_name
 +#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_table_by_index
 +#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_table_by_address
 +#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_open_directory
 +#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_next_filename
 +#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_close_directory
 +
 +/*
 + * OSL interfaces added by Linux
 + */
 +void early_acpi_os_unmap_memory(void __iomem * virt, acpi_size size);
 +
 +void acpi_os_gpe_count(u32 gpe_number);
 +
 +void acpi_os_fixed_event_count(u32 fixed_event_number);
 +
- acpi_status
- acpi_os_hotplug_execute(acpi_osd_exec_callback function, void *context);
- 
 +#endif                                /* __KERNEL__ */
 +
 +#endif                                /* __ACLINUX_H__ */