Merge branch 'devel-stable' into for-next
Conflicts: arch/arm/Makefile arch/arm/include/asm/glue-proc.h
No related branches found
No related tags found
Showing
- arch/arm/Kconfig 12 additions, 4 deletionsarch/arm/Kconfig
- arch/arm/Kconfig-nommu 13 additions, 1 deletionarch/arm/Kconfig-nommu
- arch/arm/Kconfig.debug 9 additions, 1 deletionarch/arm/Kconfig.debug
- arch/arm/Makefile 1 addition, 0 deletionsarch/arm/Makefile
- arch/arm/include/asm/arch_timer.h 0 additions, 9 deletionsarch/arm/include/asm/arch_timer.h
- arch/arm/include/asm/assembler.h 16 additions, 1 deletionarch/arm/include/asm/assembler.h
- arch/arm/include/asm/cp15.h 5 additions, 0 deletionsarch/arm/include/asm/cp15.h
- arch/arm/include/asm/cputype.h 43 additions, 2 deletionsarch/arm/include/asm/cputype.h
- arch/arm/include/asm/glue-cache.h 27 additions, 0 deletionsarch/arm/include/asm/glue-cache.h
- arch/arm/include/asm/glue-df.h 8 additions, 0 deletionsarch/arm/include/asm/glue-df.h
- arch/arm/include/asm/glue-proc.h 9 additions, 0 deletionsarch/arm/include/asm/glue-proc.h
- arch/arm/include/asm/hugetlb-3level.h 71 additions, 0 deletionsarch/arm/include/asm/hugetlb-3level.h
- arch/arm/include/asm/hugetlb.h 84 additions, 0 deletionsarch/arm/include/asm/hugetlb.h
- arch/arm/include/asm/irqflags.h 16 additions, 6 deletionsarch/arm/include/asm/irqflags.h
- arch/arm/include/asm/mach/arch.h 5 additions, 0 deletionsarch/arm/include/asm/mach/arch.h
- arch/arm/include/asm/memory.h 17 additions, 1 deletionarch/arm/include/asm/memory.h
- arch/arm/include/asm/mpu.h 76 additions, 0 deletionsarch/arm/include/asm/mpu.h
- arch/arm/include/asm/page.h 1 addition, 1 deletionarch/arm/include/asm/page.h
- arch/arm/include/asm/pgtable-3level-hwdef.h 24 additions, 0 deletionsarch/arm/include/asm/pgtable-3level-hwdef.h
- arch/arm/include/asm/pgtable-3level.h 92 additions, 4 deletionsarch/arm/include/asm/pgtable-3level.h
Loading
Please register or sign in to comment