Merge branches 'depends/rmk/devel-stable' and 'tegra/dt' into next/soc
authorArnd Bergmann <arnd@arndb.de>
Tue, 27 Dec 2011 22:51:00 +0000 (22:51 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 27 Dec 2011 22:51:00 +0000 (22:51 +0000)
Dependencies for tegra/soc branch

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

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2  3 
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,