Merge branch 'acpi-dev-pm' into acpi-enumeration
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 27 Nov 2012 12:42:42 +0000 (13:42 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 27 Nov 2012 12:42:42 +0000 (13:42 +0100)
commit45c36462aef0cccadb7755ea4edc78d13334a2be
treed707b2863494452585941d3818347005f34c636e
parentc4e050376c69bb9d67895842665264df2a2004d9
parentb88ce2a41562d1a9554f209e0f31a32d9f473794
Merge branch 'acpi-dev-pm' into acpi-enumeration

Subsequent commits in this branch will depend on 'acpi-dev-pm'
material.
drivers/acpi/Makefile
drivers/acpi/scan.c
include/acpi/acpi_bus.h
include/linux/acpi.h