From: Arnd Bergmann Date: Sat, 7 Jan 2012 12:44:37 +0000 (+0000) Subject: Merge branch 'samsung/dt' into next/dt X-Git-Tag: v3.3-rc1~143^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b001befe58691ef3627458cd814e8cee7f845c5f;p=platform%2Fupstream%2Fkernel-adaptation-pc.git Merge branch 'samsung/dt' into next/dt * samsung/dt: (3 commit) Merge branch 'depends/rmk/for-linus' into samsung/dt Merge branch 'depends/rmk/restart' into next/cleanup Merge branch 'next/cleanup' into samsung/dt Conflicts: arch/arm/mach-tegra/board-dt.c arch/arm/mach-tegra/include/mach/entry-macro.S The latest version of the samsung/dt branch resolves all sorts of conflicts with the latest upstream, no functional changes that are not already there. Signed-off-by: Arnd Bergmann --- b001befe58691ef3627458cd814e8cee7f845c5f diff --cc arch/arm/mach-tegra/board-dt.c index 0fe3230,e417a83..46074a2 --- a/arch/arm/mach-tegra/board-dt.c +++ b/arch/arm/mach-tegra/board-dt.c @@@ -150,8 -130,10 +151,10 @@@ 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, + .restart = tegra_assert_system_reset, .dt_compat = tegra_dt_board_compat, MACHINE_END