Merge back earlier cpuidle material for 3.19-rc1.

Conflicts:
	drivers/cpuidle/dt_idle_states.c

diff --cc drivers/cpuidle/cpuidle-arm64.c
Simple merge

diff --cc drivers/cpuidle/dt_idle_states.c
index 5301912cb84ed615a6a50ce50f4ea7a3aefb2494,6e6f0b272835878d715df2c8cc5894805ba21335..a5c111b67f377e2a1b8e008c9fa09a92bfcea051
--- 1/drivers/cpuidle/dt_idle_states.c
--- 2/drivers/cpuidle/dt_idle_states.c
+++ b/drivers/cpuidle/dt_idle_states.c
@@@ -74,11 -73,7 +74,11 @@@ static int init_state_node(struct cpuid
                return -EINVAL;
        }
  
-       idle_state->flags = CPUIDLE_FLAG_TIME_VALID;
 +      err = of_property_read_string(state_node, "idle-state-name", &desc);
 +      if (err)
 +              desc = state_node->name;
 +
+       idle_state->flags = 0;
        if (of_property_read_bool(state_node, "local-timer-stop"))
                idle_state->flags |= CPUIDLE_FLAG_TIMER_STOP;
        /*