diff --git a/[refs] b/[refs] index fe2d4b983b19..42dcd645a971 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 77079dbec721a282bf0931385ae10d77cdbac5af +refs/heads/master: 56e6943b41468826c26155139629c9a5379550ab diff --git a/trunk/drivers/cpuidle/governors/menu.c b/trunk/drivers/cpuidle/governors/menu.c index 73655aeb3a60..1aea7157d8ff 100644 --- a/trunk/drivers/cpuidle/governors/menu.c +++ b/trunk/drivers/cpuidle/governors/menu.c @@ -100,8 +100,8 @@ struct menu_device { int needs_update; unsigned int expected_us; - u64 predicted_us; unsigned int measured_us; + u64 predicted_us; unsigned int exit_us; unsigned int bucket; u64 correction_factor[BUCKETS];