diff --git a/[refs] b/[refs]
index 93c3721fc5fb..9b3b40ff290b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a022e3f1be11730bd8747b1af96a0274bf6356e
+refs/heads/master: 02401c06b7f6bec65f314e3cec7894502c973501
diff --git a/trunk/drivers/cpuidle/governors/menu.c b/trunk/drivers/cpuidle/governors/menu.c
index 5c17ca112fc2..06335756ea14 100644
--- a/trunk/drivers/cpuidle/governors/menu.c
+++ b/trunk/drivers/cpuidle/governors/menu.c
@@ -236,7 +236,7 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev)
 {
 	struct menu_device *data = &__get_cpu_var(menu_devices);
 	int latency_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY);
-	unsigned int power_usage = -1;
+	int power_usage = -1;
 	int i;
 	int multiplier;
 	struct timespec t;
diff --git a/trunk/include/linux/cpuidle.h b/trunk/include/linux/cpuidle.h
index d557bcd0ada7..6c26a3da0e03 100644
--- a/trunk/include/linux/cpuidle.h
+++ b/trunk/include/linux/cpuidle.h
@@ -44,7 +44,7 @@ struct cpuidle_state {
 
 	unsigned int	flags;
 	unsigned int	exit_latency; /* in US */
-	unsigned int	power_usage; /* in mW */
+	int		power_usage; /* in mW */
 	unsigned int	target_residency; /* in US */
 	unsigned int    disable;