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-imx/mach-imx27ipcam.c 1 addition, 1 deletionarch/arm/mach-imx/mach-imx27ipcam.c
- arch/arm/mach-imx/mach-imx27lite.c 1 addition, 1 deletionarch/arm/mach-imx/mach-imx27lite.c
- arch/arm/mach-imx/mach-kzm_arm11_01.c 1 addition, 1 deletionarch/arm/mach-imx/mach-kzm_arm11_01.c
- arch/arm/mach-imx/mach-mx1ads.c 2 additions, 2 deletionsarch/arm/mach-imx/mach-mx1ads.c
- arch/arm/mach-imx/mach-mx21ads.c 1 addition, 1 deletionarch/arm/mach-imx/mach-mx21ads.c
- arch/arm/mach-imx/mach-mx25_3ds.c 1 addition, 1 deletionarch/arm/mach-imx/mach-mx25_3ds.c
- arch/arm/mach-imx/mach-mx27_3ds.c 1 addition, 1 deletionarch/arm/mach-imx/mach-mx27_3ds.c
- arch/arm/mach-imx/mach-mx27ads.c 1 addition, 1 deletionarch/arm/mach-imx/mach-mx27ads.c
- arch/arm/mach-imx/mach-mx31_3ds.c 1 addition, 1 deletionarch/arm/mach-imx/mach-mx31_3ds.c
- arch/arm/mach-imx/mach-mx31ads.c 1 addition, 1 deletionarch/arm/mach-imx/mach-mx31ads.c
- arch/arm/mach-imx/mach-mx31lilly.c 1 addition, 1 deletionarch/arm/mach-imx/mach-mx31lilly.c
- arch/arm/mach-imx/mach-mx31lite.c 1 addition, 1 deletionarch/arm/mach-imx/mach-mx31lite.c
- arch/arm/mach-imx/mach-mx31moboard.c 1 addition, 1 deletionarch/arm/mach-imx/mach-mx31moboard.c
- arch/arm/mach-imx/mach-mx35_3ds.c 1 addition, 1 deletionarch/arm/mach-imx/mach-mx35_3ds.c
- arch/arm/mach-imx/mach-mxt_td60.c 1 addition, 1 deletionarch/arm/mach-imx/mach-mxt_td60.c
- arch/arm/mach-imx/mach-pca100.c 1 addition, 1 deletionarch/arm/mach-imx/mach-pca100.c
- arch/arm/mach-imx/mach-pcm037.c 1 addition, 1 deletionarch/arm/mach-imx/mach-pcm037.c
- arch/arm/mach-imx/mach-pcm038.c 1 addition, 1 deletionarch/arm/mach-imx/mach-pcm038.c
- arch/arm/mach-imx/mach-pcm043.c 1 addition, 1 deletionarch/arm/mach-imx/mach-pcm043.c
- arch/arm/mach-imx/mach-qong.c 1 addition, 1 deletionarch/arm/mach-imx/mach-qong.c
Loading
Please register or sign in to comment