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)
1  2 
drivers/acpi/device_pm.c
kernel/power/Kconfig

Simple merge
Simple merge