Merge branch 'perf/core' into perf/probes

Resolved merge conflict in tools/perf/Makefile

Merge reason: we want to queue up a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 4e83c297ec9e..6f8d8f971212 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -180,15 +180,15 @@ trip_point_type_show(struct device *dev, struct device_attribute *attr,
 
         switch (type) {
         case THERMAL_TRIP_CRITICAL:
-                return sprintf(buf, "critical");
+                return sprintf(buf, "critical\n");
         case THERMAL_TRIP_HOT:
-                return sprintf(buf, "hot");
+                return sprintf(buf, "hot\n");
         case THERMAL_TRIP_PASSIVE:
-                return sprintf(buf, "passive");
+                return sprintf(buf, "passive\n");
         case THERMAL_TRIP_ACTIVE:
-                return sprintf(buf, "active");
+                return sprintf(buf, "active\n");
         default:
-                return sprintf(buf, "unknown");
+                return sprintf(buf, "unknown\n");
         }
 }