Merge branch 'pm-qos' into acpi-dev-pm
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 14 Nov 2012 23:13:50 +0000 (00:13 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 14 Nov 2012 23:13:50 +0000 (00:13 +0100)
commitdea553e3fc63c5e53a3f8741f0c9f840660cf06e
tree3f87bc48f50c318f248934e74de8206a8597480f
parent77b67063bb6bce6d475e910d3b886a606d0d91f7
parent7e4d68443a80574392d1027ff34992ab945934a6
Merge branch 'pm-qos' into acpi-dev-pm

Material in the 'acpi-dev-pm' branch depends on 'pm-qos' commits.
drivers/base/power/domain.c