diff --git a/[refs] b/[refs]
index 27529a325154..57d7195bba58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d948ce3447cae1f82cdbef9d74d79bc8d9d8700
+refs/heads/master: edbfc1ba08b7cc4677fb1f781bd94dc154142215
diff --git a/trunk/Documentation/trace/events-power.txt b/trunk/Documentation/trace/events-power.txt
index 96d87b67fe37..cf794af22855 100644
--- a/trunk/Documentation/trace/events-power.txt
+++ b/trunk/Documentation/trace/events-power.txt
@@ -57,7 +57,7 @@ power_end		"cpu_id=%lu"
 The 'type' parameter takes one of those macros:
  . POWER_NONE	= 0,
  . POWER_CSTATE	= 1,	/* C-State */
- . POWER_PSTATE	= 2,	/* Fequency change or DVFS */
+ . POWER_PSTATE	= 2,	/* Frequency change or DVFS */
 
 The 'state' parameter is set depending on the type:
  . Target C-state for type=POWER_CSTATE,