Merge branch 'for-linus' of git://www.jni.nu/cris
* 'for-linus' of git://www.jni.nu/cris: [CRISv10] Clean up compressed/misc.c [CRISv10] Correct whitespace damage. [CRIS] Correct definition of subdirs for install_headers. [CRIS] Correct image makefiles to allow using a separate OBJ-directory. [CRIS] Build fixes for compressed and rescue images for v10 and v32: It looks at least odd to apply spin_unlock to a mutex. cris: compile fixes for 2.6.26-rc5
No related branches found
No related tags found
Showing
- arch/cris/arch-v10/boot/Makefile 0 additions, 1 deletionarch/cris/arch-v10/boot/Makefile
- arch/cris/arch-v10/boot/compressed/Makefile 3 additions, 11 deletionsarch/cris/arch-v10/boot/compressed/Makefile
- arch/cris/arch-v10/boot/compressed/decompress.ld 2 additions, 1 deletionarch/cris/arch-v10/boot/compressed/decompress.ld
- arch/cris/arch-v10/boot/compressed/head.S 49 additions, 49 deletionsarch/cris/arch-v10/boot/compressed/head.S
- arch/cris/arch-v10/boot/compressed/misc.c 77 additions, 67 deletionsarch/cris/arch-v10/boot/compressed/misc.c
- arch/cris/arch-v10/boot/rescue/Makefile 3 additions, 6 deletionsarch/cris/arch-v10/boot/rescue/Makefile
- arch/cris/arch-v10/drivers/pcf8563.c 1 addition, 1 deletionarch/cris/arch-v10/drivers/pcf8563.c
- arch/cris/arch-v10/kernel/debugport.c 13 additions, 7 deletionsarch/cris/arch-v10/kernel/debugport.c
- arch/cris/arch-v32/boot/Makefile 0 additions, 1 deletionarch/cris/arch-v32/boot/Makefile
- arch/cris/arch-v32/boot/compressed/Makefile 1 addition, 5 deletionsarch/cris/arch-v32/boot/compressed/Makefile
- arch/cris/arch-v32/boot/rescue/Makefile 1 addition, 2 deletionsarch/cris/arch-v32/boot/rescue/Makefile
- arch/cris/arch-v32/drivers/pcf8563.c 1 addition, 1 deletionarch/cris/arch-v32/drivers/pcf8563.c
- include/asm-cris/Kbuild 3 additions, 2 deletionsinclude/asm-cris/Kbuild
Loading
Please register or sign in to comment