diff --git a/[refs] b/[refs]
index 65abee1b0162..f1faf3d981b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bffd1f8ac87a798515a8aed5f64047b182e049f5
+refs/heads/master: 8837295a73f3500b32e18f9862c7bdde0b958648
diff --git a/trunk/Documentation/thermal/sysfs-api.txt b/trunk/Documentation/thermal/sysfs-api.txt
index 6859661c9d31..277530a5786c 100644
--- a/trunk/Documentation/thermal/sysfs-api.txt
+++ b/trunk/Documentation/thermal/sysfs-api.txt
@@ -265,6 +265,10 @@ emul_temp
 	Unit: millidegree Celsius
 	WO, Optional
 
+	  WARNING: Be careful while enabling this option on production systems,
+	  because userland can easily disable the thermal policy by simply
+	  flooding this sysfs node with low temperature values.
+
 *****************************
 * Cooling device attributes *
 *****************************
diff --git a/trunk/drivers/thermal/Kconfig b/trunk/drivers/thermal/Kconfig
index 2a19120c32bd..fb0672baff40 100644
--- a/trunk/drivers/thermal/Kconfig
+++ b/trunk/drivers/thermal/Kconfig
@@ -86,6 +86,10 @@ config THERMAL_EMULATION
 	  user can manually input temperature and test the different trip
 	  threshold behaviour for simulation purpose.
 
+	  WARNING: Be careful while enabling this option on production systems,
+	  because userland can easily disable the thermal policy by simply
+	  flooding this sysfs node with low temperature values.
+
 config SPEAR_THERMAL
 	bool "SPEAr thermal sensor driver"
 	depends on PLAT_SPEAR