Merge branch for-3.14/soc into for-next

diff --cc arch/arm/mach-tegra/Kconfig
Simple merge

diff --cc arch/arm/mach-tegra/fuse.c
Simple merge

diff --cc arch/arm/mach-tegra/powergate.c
index f6f5b54ff95edcd106ff82b718a251ba99123f31,b766db79b572a7fb6bee167cfec1d963c7af1a44..a67c92acb4a6ab4b8357efdd532e960707044c91
--- 1/arch/arm/mach-tegra/powergate.c
--- 2/arch/arm/mach-tegra/powergate.c
+++ b/arch/arm/mach-tegra/powergate.c
@@@ -143,10 -143,10 +144,11 @@@ int tegra_powergate_remove_clamping(in
  
        return 0;
  }
+ EXPORT_SYMBOL(tegra_powergate_remove_clamping);
  
  /* Must be called with clk disabled, and returns with clk enabled */
 -int tegra_powergate_sequence_power_up(int id, struct clk *clk)
 +int tegra_powergate_sequence_power_up(int id, struct clk *clk,
 +                                      struct reset_control *rst)
  {
        int ret;