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-footbridge/cats-hw.c 1 addition, 1 deletionarch/arm/mach-footbridge/cats-hw.c
- arch/arm/mach-footbridge/ebsa285.c 1 addition, 1 deletionarch/arm/mach-footbridge/ebsa285.c
- arch/arm/mach-footbridge/include/mach/debug-macro.S 2 additions, 2 deletionsarch/arm/mach-footbridge/include/mach/debug-macro.S
- arch/arm/mach-footbridge/netwinder-hw.c 1 addition, 1 deletionarch/arm/mach-footbridge/netwinder-hw.c
- arch/arm/mach-footbridge/personal.c 1 addition, 1 deletionarch/arm/mach-footbridge/personal.c
- arch/arm/mach-gemini/board-nas4220b.c 1 addition, 1 deletionarch/arm/mach-gemini/board-nas4220b.c
- arch/arm/mach-gemini/board-rut1xx.c 1 addition, 1 deletionarch/arm/mach-gemini/board-rut1xx.c
- arch/arm/mach-gemini/board-wbd111.c 1 addition, 1 deletionarch/arm/mach-gemini/board-wbd111.c
- arch/arm/mach-gemini/board-wbd222.c 1 addition, 1 deletionarch/arm/mach-gemini/board-wbd222.c
- arch/arm/mach-gemini/include/mach/debug-macro.S 1 addition, 1 deletionarch/arm/mach-gemini/include/mach/debug-macro.S
- arch/arm/mach-gemini/include/mach/memory.h 0 additions, 19 deletionsarch/arm/mach-gemini/include/mach/memory.h
- arch/arm/mach-h720x/h7201-eval.c 1 addition, 1 deletionarch/arm/mach-h720x/h7201-eval.c
- arch/arm/mach-h720x/h7202-eval.c 1 addition, 1 deletionarch/arm/mach-h720x/h7202-eval.c
- arch/arm/mach-h720x/include/mach/debug-macro.S 1 addition, 1 deletionarch/arm/mach-h720x/include/mach/debug-macro.S
- arch/arm/mach-h720x/include/mach/memory.h 0 additions, 11 deletionsarch/arm/mach-h720x/include/mach/memory.h
- arch/arm/mach-imx/mach-armadillo5x0.c 1 addition, 1 deletionarch/arm/mach-imx/mach-armadillo5x0.c
- arch/arm/mach-imx/mach-cpuimx27.c 1 addition, 1 deletionarch/arm/mach-imx/mach-cpuimx27.c
- arch/arm/mach-imx/mach-cpuimx35.c 1 addition, 1 deletionarch/arm/mach-imx/mach-cpuimx35.c
- arch/arm/mach-imx/mach-eukrea_cpuimx25.c 1 addition, 1 deletionarch/arm/mach-imx/mach-eukrea_cpuimx25.c
- arch/arm/mach-imx/mach-imx27_visstrim_m10.c 1 addition, 1 deletionarch/arm/mach-imx/mach-imx27_visstrim_m10.c
Loading
Please register or sign in to comment