Merge branch 'devel-stable' into for-linus
Conflicts: arch/arm/Kconfig arch/arm/mach-ns9xxx/include/mach/uncompress.h
No related branches found
No related tags found
Showing
- arch/arm/Kconfig 3 additions, 1 deletionarch/arm/Kconfig
- arch/arm/Makefile 1 addition, 2 deletionsarch/arm/Makefile
- arch/arm/boot/compressed/Makefile 14 additions, 3 deletionsarch/arm/boot/compressed/Makefile
- arch/arm/boot/compressed/decompress.c 2 additions, 2 deletionsarch/arm/boot/compressed/decompress.c
- arch/arm/boot/compressed/head.S 19 additions, 11 deletionsarch/arm/boot/compressed/head.S
- arch/arm/boot/compressed/misc.c 10 additions, 14 deletionsarch/arm/boot/compressed/misc.c
- arch/arm/common/gic.c 45 additions, 39 deletionsarch/arm/common/gic.c
- arch/arm/configs/dove_defconfig 1 addition, 11 deletionsarch/arm/configs/dove_defconfig
- arch/arm/configs/mx1_defconfig 1 addition, 0 deletionsarch/arm/configs/mx1_defconfig
- arch/arm/configs/mx51_defconfig 1 addition, 1 deletionarch/arm/configs/mx51_defconfig
- arch/arm/mach-davinci/include/mach/uncompress.h 3 additions, 2 deletionsarch/arm/mach-davinci/include/mach/uncompress.h
- arch/arm/mach-davinci/irq.c 20 additions, 73 deletionsarch/arm/mach-davinci/irq.c
- arch/arm/mach-dove/common.c 32 additions, 584 deletionsarch/arm/mach-dove/common.c
- arch/arm/mach-dove/mpp.c 43 additions, 91 deletionsarch/arm/mach-dove/mpp.c
- arch/arm/mach-dove/mpp.h 169 additions, 193 deletionsarch/arm/mach-dove/mpp.h
- arch/arm/mach-exynos4/irq-combiner.c 2 additions, 4 deletionsarch/arm/mach-exynos4/irq-combiner.c
- arch/arm/mach-gemini/include/mach/uncompress.h 1 addition, 1 deletionarch/arm/mach-gemini/include/mach/uncompress.h
- arch/arm/mach-imx/Kconfig 286 additions, 0 deletionsarch/arm/mach-imx/Kconfig
- arch/arm/mach-imx/Makefile 31 additions, 7 deletionsarch/arm/mach-imx/Makefile
- arch/arm/mach-imx/Makefile.boot 4 additions, 0 deletionsarch/arm/mach-imx/Makefile.boot
Loading
Please register or sign in to comment