Merge branches 'pm-cpufreq' and 'pm-cpuidle'

* pm-cpufreq:
  cpufreq: fix a NULL pointer dereference in __cpufreq_governor()
  cpufreq-dt: defer probing if OPP table is not ready

* pm-cpuidle:
  cpuidle / ACPI: remove unused CPUIDLE_FLAG_TIME_INVALID
  cpuidle: ladder: Better idle duration measurement without using CPUIDLE_FLAG_TIME_INVALID
  cpuidle: menu: Better idle duration measurement without using CPUIDLE_FLAG_TIME_INVALID

diff --cc drivers/acpi/processor_idle.c
index 4995365,17f9ec5,7afba40..87b704e
--- 1/drivers/acpi/processor_idle.c
--- 2/drivers/acpi/processor_idle.c
--- 3/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@@@ -985,8 -985,8 -985,6 +985,6 @@@@ static int acpi_processor_setup_cpuidle
                state->flags = 0;
                switch (cx->type) {
                        case ACPI_STATE_C1:
-                       if (cx->entry_method != ACPI_CSTATE_FFH)
-                               state->flags |= CPUIDLE_FLAG_TIME_INVALID;
 -                      if (cx->entry_method == ACPI_CSTATE_FFH)
 -                              state->flags |= CPUIDLE_FLAG_TIME_VALID;
   
                        state->enter = acpi_idle_enter_c1;
                        state->enter_dead = acpi_idle_play_dead;

diff --cc drivers/cpufreq/cpufreq-dt.c
Simple merge