Merge remote-tracking branch 'lsk/v3.10/topic/genpd' into linux-linaro-lsk
authorMark Brown <broonie@kernel.org>
Sat, 13 Dec 2014 11:39:36 +0000 (11:39 +0000)
committerMark Brown <broonie@kernel.org>
Sat, 13 Dec 2014 11:39:36 +0000 (11:39 +0000)
commit3e5fe00cd38e033796a0de2ea9928c0cb460e6b6
tree0996fa20df211dd113519735846c8555d74d3d03
parent32a13f39f539963aee2c0b08f4da973db192a2ff
parent6920cae74d18abc2e1a2fda0970f8e9889ef3b7d
Merge remote-tracking branch 'lsk/v3.10/topic/genpd' into linux-linaro-lsk
drivers/acpi/device_pm.c
kernel/power/Kconfig