Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] fix single stepped svcs with TRACE_IRQFLAGS=y [S390] zcrypt: Do not remove coprocessor for error 8/72 [S390] sclp_vt220: set initial terminal window size [S390] use set_current_state in sigsuspend [S390] irqflags: add missing types.h include [S390] dasd: fix possible NULL pointer errors
No related branches found
No related tags found
Showing
- arch/s390/include/asm/irqflags.h 3 additions, 6 deletionsarch/s390/include/asm/irqflags.h
- arch/s390/kernel/entry.S 1 addition, 0 deletionsarch/s390/kernel/entry.S
- arch/s390/kernel/entry64.S 1 addition, 0 deletionsarch/s390/kernel/entry64.S
- arch/s390/kernel/signal.c 1 addition, 1 deletionarch/s390/kernel/signal.c
- drivers/s390/block/dasd.c 4 additions, 4 deletionsdrivers/s390/block/dasd.c
- drivers/s390/block/dasd_eckd.c 1 addition, 1 deletiondrivers/s390/block/dasd_eckd.c
- drivers/s390/block/dasd_ioctl.c 2 additions, 5 deletionsdrivers/s390/block/dasd_ioctl.c
- drivers/s390/block/dasd_proc.c 2 additions, 5 deletionsdrivers/s390/block/dasd_proc.c
- drivers/s390/char/sclp_vt220.c 4 additions, 0 deletionsdrivers/s390/char/sclp_vt220.c
- drivers/s390/crypto/zcrypt_pcicc.c 2 additions, 0 deletionsdrivers/s390/crypto/zcrypt_pcicc.c
- drivers/s390/crypto/zcrypt_pcixcc.c 2 additions, 0 deletionsdrivers/s390/crypto/zcrypt_pcixcc.c
Loading
Please register or sign in to comment