diff --git a/[refs] b/[refs]
index 968aac7c7abb..36046b0f1b06 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86c38a31aa7f2dd6e74a262710bf8ebf7455acc5
+refs/heads/master: 1ab83a89411556c4d5914dcf0d5da190178ae7db
diff --git a/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig
index 6c22d8a2f289..ca2d3a8778b6 100644
--- a/trunk/kernel/trace/Kconfig
+++ b/trunk/kernel/trace/Kconfig
@@ -330,15 +330,6 @@ config BRANCH_TRACER
 
 	  Say N if unsure.
 
-config POWER_TRACER
-	bool "Trace power consumption behavior"
-	depends on X86
-	select GENERIC_TRACER
-	help
-	  This tracer helps developers to analyze and optimize the kernel's
-	  power management decisions, specifically the C-state and P-state
-	  behavior.
-
 config KSYM_TRACER
 	bool "Trace read and write access on kernel memory locations"
 	depends on HAVE_HW_BREAKPOINT