-
- Downloads
Merge branch 'devel-stable' into devel
Conflicts: arch/arm/kernel/entry-armv.S arch/arm/kernel/setup.c arch/arm/mm/init.c
Showing
- arch/arm/Kconfig 135 additions, 1 deletionarch/arm/Kconfig
- arch/arm/Makefile 7 additions, 2 deletionsarch/arm/Makefile
- arch/arm/boot/Makefile 3 additions, 5 deletionsarch/arm/boot/Makefile
- arch/arm/boot/compressed/Makefile 1 addition, 10 deletionsarch/arm/boot/compressed/Makefile
- arch/arm/boot/compressed/Makefile.debug 0 additions, 23 deletionsarch/arm/boot/compressed/Makefile.debug
- arch/arm/boot/compressed/head.S 29 additions, 11 deletionsarch/arm/boot/compressed/head.S
- arch/arm/boot/compressed/misc.c 0 additions, 20 deletionsarch/arm/boot/compressed/misc.c
- arch/arm/configs/kirkwood_defconfig 8 additions, 0 deletionsarch/arm/configs/kirkwood_defconfig
- arch/arm/include/asm/elf.h 4 additions, 0 deletionsarch/arm/include/asm/elf.h
- arch/arm/include/asm/mach/pci.h 1 addition, 0 deletionsarch/arm/include/asm/mach/pci.h
- arch/arm/include/asm/stackprotector.h 38 additions, 0 deletionsarch/arm/include/asm/stackprotector.h
- arch/arm/kernel/Makefile 3 additions, 1 deletionarch/arm/kernel/Makefile
- arch/arm/kernel/asm-offsets.c 3 additions, 0 deletionsarch/arm/kernel/asm-offsets.c
- arch/arm/kernel/compat.c 0 additions, 7 deletionsarch/arm/kernel/compat.c
- arch/arm/kernel/compat.h 0 additions, 2 deletionsarch/arm/kernel/compat.h
- arch/arm/kernel/entry-armv.S 8 additions, 0 deletionsarch/arm/kernel/entry-armv.S
- arch/arm/kernel/process.c 13 additions, 0 deletionsarch/arm/kernel/process.c
- arch/arm/kernel/setup.c 11 additions, 0 deletionsarch/arm/kernel/setup.c
- arch/arm/mach-cns3xxx/Makefile 2 additions, 1 deletionarch/arm/mach-cns3xxx/Makefile
- arch/arm/mach-cns3xxx/cns3420vb.c 4 additions, 0 deletionsarch/arm/mach-cns3xxx/cns3420vb.c
Loading
Please register or sign in to comment