Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: "All pretty boring, seems like all of us had better things to do last summer..." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR m68k/q40: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR m68k/amiga: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR m68k/apollo: Remove disabled definitions in apollohw.h
Showing
- arch/m68k/amiga/platform.c 1 addition, 4 deletionsarch/m68k/amiga/platform.c
- arch/m68k/include/asm/apollohw.h 0 additions, 12 deletionsarch/m68k/include/asm/apollohw.h
- arch/m68k/kernel/time.c 1 addition, 4 deletionsarch/m68k/kernel/time.c
- arch/m68k/q40/config.c 1 addition, 4 deletionsarch/m68k/q40/config.c
Loading
Please register or sign in to comment