From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 27 Dec 2011 22:51:00 +0000 (+0000)
Subject: Merge branches 'depends/rmk/devel-stable' and 'tegra/dt' into next/soc
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0782e5bb57e16428de32f0f933c77324b186193f;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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>
---

0782e5bb57e16428de32f0f933c77324b186193f
diff --cc arch/arm/mach-tegra/board-dt.c
index f6f03ce340fc,f6f03ce340fc,0fe32301792f..2ec1a0d7b600
--- a/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,