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-dove/include/mach/memory.h 0 additions, 10 deletionsarch/arm/mach-dove/include/mach/memory.h
- arch/arm/mach-ebsa110/core.c 1 addition, 1 deletionarch/arm/mach-ebsa110/core.c
- arch/arm/mach-ebsa110/include/mach/debug-macro.S 1 addition, 1 deletionarch/arm/mach-ebsa110/include/mach/debug-macro.S
- arch/arm/mach-ep93xx/adssphere.c 1 addition, 1 deletionarch/arm/mach-ep93xx/adssphere.c
- arch/arm/mach-ep93xx/edb93xx.c 8 additions, 8 deletionsarch/arm/mach-ep93xx/edb93xx.c
- arch/arm/mach-ep93xx/gesbc9312.c 1 addition, 1 deletionarch/arm/mach-ep93xx/gesbc9312.c
- arch/arm/mach-ep93xx/include/mach/debug-macro.S 1 addition, 1 deletionarch/arm/mach-ep93xx/include/mach/debug-macro.S
- arch/arm/mach-ep93xx/micro9.c 4 additions, 4 deletionsarch/arm/mach-ep93xx/micro9.c
- arch/arm/mach-ep93xx/simone.c 2 additions, 2 deletionsarch/arm/mach-ep93xx/simone.c
- arch/arm/mach-ep93xx/snappercl15.c 1 addition, 1 deletionarch/arm/mach-ep93xx/snappercl15.c
- arch/arm/mach-ep93xx/ts72xx.c 1 addition, 1 deletionarch/arm/mach-ep93xx/ts72xx.c
- arch/arm/mach-exynos4/include/mach/debug-macro.S 1 addition, 1 deletionarch/arm/mach-exynos4/include/mach/debug-macro.S
- arch/arm/mach-exynos4/include/mach/entry-macro.S 1 addition, 6 deletionsarch/arm/mach-exynos4/include/mach/entry-macro.S
- arch/arm/mach-exynos4/mach-armlex4210.c 1 addition, 1 deletionarch/arm/mach-exynos4/mach-armlex4210.c
- arch/arm/mach-exynos4/mach-nuri.c 1 addition, 1 deletionarch/arm/mach-exynos4/mach-nuri.c
- arch/arm/mach-exynos4/mach-smdkc210.c 1 addition, 1 deletionarch/arm/mach-exynos4/mach-smdkc210.c
- arch/arm/mach-exynos4/mach-smdkv310.c 1 addition, 1 deletionarch/arm/mach-exynos4/mach-smdkv310.c
- arch/arm/mach-exynos4/mach-universal_c210.c 1 addition, 1 deletionarch/arm/mach-exynos4/mach-universal_c210.c
- arch/arm/mach-exynos4/mct.c 5 additions, 2 deletionsarch/arm/mach-exynos4/mct.c
- arch/arm/mach-exynos4/platsmp.c 4 additions, 6 deletionsarch/arm/mach-exynos4/platsmp.c
Loading
Please register or sign in to comment