]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
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)
Material in the 'acpi-dev-pm' branch depends on 'pm-qos' commits.

1  2 
drivers/base/power/domain.c

Simple merge