Merge remote-tracking branch 'torvalds/master' into perf/core

[sfrench/cifs-2.6.git] / drivers / powercap / Kconfig

diff --git a/drivers/powercap/Kconfig b/drivers/powercap/Kconfig
index 20b4325c6161cbc2c39f29e3338beaa83f85b724..8242e8c5ed77ec760efae8b5543488b3db054cab 100644 (file)
--- a/drivers/powercap/Kconfig
+++ b/drivers/powercap/Kconfig
@@ -45,7 +45,7 @@ config IDLE_INJECT
          on a per CPU basis.
 
 config DTPM
-       bool "Power capping for Dynamic Thermal Power Management"
+       bool "Power capping for Dynamic Thermal Power Management (EXPERIMENTAL)"
        help
          This enables support for the power capping for the dynamic
          thermal power management userspace engine.