Merge branch 'for-linus' of git://www.jni.nu/cris
* 'for-linus' of git://www.jni.nu/cris: Correct auto-restart of syscalls via restartblock CRISv10: Fix return before mutex_unlock in pcf8563 Drop the CRISv32 version of pcf8563
Showing
- arch/cris/Kconfig 1 addition, 2 deletionsarch/cris/Kconfig
- arch/cris/arch-v10/drivers/pcf8563.c 1 addition, 1 deletionarch/cris/arch-v10/drivers/pcf8563.c
- arch/cris/arch-v10/kernel/signal.c 1 addition, 1 deletionarch/cris/arch-v10/kernel/signal.c
- arch/cris/arch-v32/drivers/Makefile 0 additions, 1 deletionarch/cris/arch-v32/drivers/Makefile
- arch/cris/arch-v32/drivers/pcf8563.c 0 additions, 377 deletionsarch/cris/arch-v32/drivers/pcf8563.c
Loading
Please register or sign in to comment