Merge branches 'pm-devfreq' and 'pm-tools'

* pm-devfreq:
  PM / devfreq: tegra30: Separate configurations per-SoC generation
  PM / devfreq: tegra30: Support interconnect and OPPs from device-tree
  PM / devfreq: tegra20: Deprecate in a favor of emc-stat based driver
  PM / devfreq: exynos-bus: Add registration of interconnect child device
  dt-bindings: devfreq: Add documentation for the interconnect properties
  soc/tegra: fuse: Add stub for tegra_sku_info
  soc/tegra: fuse: Export tegra_read_ram_code()
  clk: tegra: Export Tegra20 EMC kernel symbols
  PM / devfreq: tegra30: Silence deferred probe error
  PM / devfreq: tegra20: Relax Kconfig dependency
  PM / devfreq: tegra20: Silence deferred probe error
  PM / devfreq: Remove redundant governor_name from struct devfreq
  PM / devfreq: Add governor attribute flag for specifc sysfs nodes
  PM / devfreq: Add governor feature flag
  PM / devfreq: Add tracepoint for frequency changes
  PM / devfreq: Unify frequency change to devfreq_update_target func
  trace: events: devfreq: Use fixed indentation size to improve readability

* pm-tools:
  pm-graph v5.8
  cpupower: Provide online and offline CPU information

diff --cc drivers/devfreq/exynos-bus.c
index 143fd58ec3dcb893829b68367cf5963476353346,20447a401af432065734659152955a61277cb399,1e684a448c9efe898956683113d4f4a1af93bfb3..e689101abc93036c0b84a435e1489bdb1c41d1cf
--- 1/drivers/devfreq/exynos-bus.c
--- 2/drivers/devfreq/exynos-bus.c
--- 3/drivers/devfreq/exynos-bus.c
+++ b/drivers/devfreq/exynos-bus.c
@@@@ -156,10 -157,14 -156,12 +157,12 @@@@ static void exynos_bus_exit(struct devi
        if (ret < 0)
                dev_warn(dev, "failed to disable the devfreq-event devices\n");
   
+ +     platform_device_unregister(bus->icc_pdev);
+ +
        dev_pm_opp_of_remove_table(dev);
        clk_disable_unprepare(bus->clk);
 --     if (bus->opp_table) {
 --             dev_pm_opp_put_regulators(bus->opp_table);
 --             bus->opp_table = NULL;
 --     }
 ++     dev_pm_opp_put_regulators(bus->opp_table);
 ++     bus->opp_table = NULL;
   }
   
   static void exynos_bus_passive_exit(struct device *dev)