Merge remote-tracking branch 'tegra/for-next'

Conflicts:
	arch/arm/mach-tegra/board-dt.c
	arch/arm/mach-tegra/include/mach/entry-macro.S

diff --cc arch/arm/mach-tegra/board-dt.c
index e417a8383dbbcb4feae0dfdd2f59d956d8faeaa3,2fa599da7deb631f73e8da6356c220ad5305d02b..ddc5effef91f9b22891f07af421e7e6c2c72c511
--- 1/arch/arm/mach-tegra/board-dt.c
--- 2/arch/arm/mach-tegra/board-dt.c
+++ b/arch/arm/mach-tegra/board-dt.c
@@@ -130,10 -150,8 +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

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

diff --cc arch/arm/mach-tegra/include/mach/entry-macro.S
index ac11262149c701b0908b6f54b31c90ba206fbb82,485a11eeaceb6f469d5078e9775e2070a98d109a..846d35c9bcb35e72e9bcd032e0b7a98aeae477af
--- 1/arch/arm/mach-tegra/include/mach/entry-macro.S
--- 2/arch/arm/mach-tegra/include/mach/entry-macro.S
+++ b/arch/arm/mach-tegra/include/mach/entry-macro.S
@@@ -16,23 -24,10 +16,8 @@@
        .macro  disable_fiq
        .endm
  
 -      .macro  get_irqnr_preamble, base, tmp
 -      movw \base, #(ICTRL_BASE & 0x0000ffff)
 -      movt \base, #((ICTRL_BASE & 0xffff0000) >> 16)
 +      .macro  arch_ret_to_user, tmp1, tmp2
        .endm
  
- #if !defined(CONFIG_ARM_GIC)
-       /* legacy interrupt controller for AP16 */
- 
-       .macro  get_irqnr_preamble, base, tmp
-       @ enable imprecise aborts
-       cpsie   a
-       @ EVP base at 0xf010f000
-       mov \base, #0xf0000000
-       orr \base, #0x00100000
-       orr \base, #0x0000f000
-       .endm
- 
-       .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
-       ldr \irqnr, [\base, #0x20]      @ EVT_IRQ_STS
-       cmp \irqnr, #0x80
+       .macro  arch_ret_to_user, tmp1, tmp2
        .endm
- #endif