Merge branches 'depends/rmk/devel-stable' and 'tegra/dt' into next/soc

Dependencies for tegra/soc branch

Conflicts:
  arch/arm/mach-tegra/board-dt.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/mach-tegra/board-dt.c
index f6f03ce340fcafd4a0f72dff707ad3764a6321e2,f6f03ce340fcafd4a0f72dff707ad3764a6321e2,0fe32301792f8a7f178473a62e40c46177bdd87c..2ec1a0d7b6003d4fc2576b6b2a673b6b7a1b2a33
--- 1/arch/arm/mach-tegra/board-dt.c
--- 2/arch/arm/mach-tegra/board-dt.c
--- 3/arch/arm/mach-tegra/board-dt.c
+++ b/arch/arm/mach-tegra/board-dt.c
@@@@ -130,8 -130,8 -150,7 +151,8 @@@@ static const char * tegra_dt_board_comp
   DT_MACHINE_START(TEGRA_DT, "nVidia Tegra (Flattened Device Tree)")
        .map_io         = tegra_map_common_io,
        .init_early     = tegra_init_early,
--      .init_irq       = tegra_init_irq,
++      .init_irq       = tegra_dt_init_irq,
  +     .handle_irq     = gic_handle_irq,
        .timer          = &tegra_timer,
        .init_machine   = tegra_dt_init,
        .dt_compat      = tegra_dt_board_compat,