Merge branch 'dt/gic' into next/dt
Conflicts: arch/arm/include/asm/localtimer.h arch/arm/mach-msm/board-msm8x60.c arch/arm/mach-omap2/board-generic.c
No related branches found
No related tags found
Showing
- arch/arm/mach-at91/at91sam9g45.c 2 additions, 0 deletionsarch/arm/mach-at91/at91sam9g45.c
- arch/arm/mach-at91/include/mach/at91sam9g45.h 0 additions, 2 deletionsarch/arm/mach-at91/include/mach/at91sam9g45.h
- arch/arm/mach-at91/include/mach/debug-macro.S 1 addition, 1 deletionarch/arm/mach-at91/include/mach/debug-macro.S
- arch/arm/mach-bcmring/include/mach/hardware.h 1 addition, 2 deletionsarch/arm/mach-bcmring/include/mach/hardware.h
- arch/arm/mach-bcmring/include/mach/memory.h 0 additions, 33 deletionsarch/arm/mach-bcmring/include/mach/memory.h
- arch/arm/mach-bcmring/mm.c 3 additions, 0 deletionsarch/arm/mach-bcmring/mm.c
- arch/arm/mach-clps711x/autcpu12.c 1 addition, 1 deletionarch/arm/mach-clps711x/autcpu12.c
- arch/arm/mach-clps711x/cdb89712.c 1 addition, 1 deletionarch/arm/mach-clps711x/cdb89712.c
- arch/arm/mach-clps711x/ceiva.c 1 addition, 1 deletionarch/arm/mach-clps711x/ceiva.c
- arch/arm/mach-clps711x/clep7312.c 1 addition, 1 deletionarch/arm/mach-clps711x/clep7312.c
- arch/arm/mach-clps711x/edb7211-arch.c 1 addition, 1 deletionarch/arm/mach-clps711x/edb7211-arch.c
- arch/arm/mach-clps711x/fortunet.c 0 additions, 1 deletionarch/arm/mach-clps711x/fortunet.c
- arch/arm/mach-clps711x/include/mach/debug-macro.S 1 addition, 1 deletionarch/arm/mach-clps711x/include/mach/debug-macro.S
- arch/arm/mach-clps711x/p720t.c 1 addition, 1 deletionarch/arm/mach-clps711x/p720t.c
- arch/arm/mach-cns3xxx/cns3420vb.c 1 addition, 1 deletionarch/arm/mach-cns3xxx/cns3420vb.c
- arch/arm/mach-cns3xxx/include/mach/debug-macro.S 1 addition, 1 deletionarch/arm/mach-cns3xxx/include/mach/debug-macro.S
- arch/arm/mach-cns3xxx/include/mach/memory.h 0 additions, 26 deletionsarch/arm/mach-cns3xxx/include/mach/memory.h
- arch/arm/mach-davinci/board-da830-evm.c 1 addition, 1 deletionarch/arm/mach-davinci/board-da830-evm.c
- arch/arm/mach-davinci/board-da850-evm.c 1 addition, 1 deletionarch/arm/mach-davinci/board-da850-evm.c
- arch/arm/mach-davinci/board-dm355-evm.c 1 addition, 1 deletionarch/arm/mach-davinci/board-dm355-evm.c
Loading
Please register or sign in to comment