Merge branches 'consolidate-clksrc', 'consolidate-flash',...
Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate
Showing
- arch/arm/Kconfig 0 additions, 12 deletionsarch/arm/Kconfig
- arch/arm/Makefile 0 additions, 3 deletionsarch/arm/Makefile
- arch/arm/common/sa1111.c 0 additions, 8 deletionsarch/arm/common/sa1111.c
- arch/arm/configs/mxs_defconfig 129 additions, 0 deletionsarch/arm/configs/mxs_defconfig
- arch/arm/configs/realview-smp_defconfig 1 addition, 1 deletionarch/arm/configs/realview-smp_defconfig
- arch/arm/configs/realview_defconfig 1 addition, 1 deletionarch/arm/configs/realview_defconfig
- arch/arm/configs/stmp378x_defconfig 0 additions, 128 deletionsarch/arm/configs/stmp378x_defconfig
- arch/arm/configs/stmp37xx_defconfig 0 additions, 108 deletionsarch/arm/configs/stmp37xx_defconfig
- arch/arm/configs/versatile_defconfig 1 addition, 1 deletionarch/arm/configs/versatile_defconfig
- arch/arm/include/asm/dma.h 3 additions, 1 deletionarch/arm/include/asm/dma.h
- arch/arm/include/asm/memory.h 3 additions, 7 deletionsarch/arm/include/asm/memory.h
- arch/arm/include/asm/sizes.h 2 additions, 40 deletionsarch/arm/include/asm/sizes.h
- arch/arm/include/asm/smp.h 2 additions, 4 deletionsarch/arm/include/asm/smp.h
- arch/arm/kernel/smp.c 7 additions, 0 deletionsarch/arm/kernel/smp.c
- arch/arm/mach-davinci/include/mach/memory.h 1 addition, 17 deletionsarch/arm/mach-davinci/include/mach/memory.h
- arch/arm/mach-exynos4/include/mach/smp.h 0 additions, 19 deletionsarch/arm/mach-exynos4/include/mach/smp.h
- arch/arm/mach-exynos4/platsmp.c 4 additions, 1 deletionarch/arm/mach-exynos4/platsmp.c
- arch/arm/mach-h720x/include/mach/memory.h 1 addition, 2 deletionsarch/arm/mach-h720x/include/mach/memory.h
- arch/arm/mach-integrator/integrator_ap.c 6 additions, 7 deletionsarch/arm/mach-integrator/integrator_ap.c
- arch/arm/mach-integrator/integrator_cp.c 6 additions, 7 deletionsarch/arm/mach-integrator/integrator_cp.c
Loading
Please register or sign in to comment