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] cio: online_store - trigger recognition for boxed devices [S390] cio: disallow online setting of device in transient state [S390] cio: introduce notifier for boxed state [S390] cio: introduce ccw_device_schedule_sch_unregister [S390] cio: wake up on failed recognition [S390] fix hypfs build failure [PATCH] sysrq: include interrupt.h instead of irq.h
No related branches found
No related tags found
Showing
- arch/s390/hypfs/hypfs_diag.c 2 additions, 0 deletionsarch/s390/hypfs/hypfs_diag.c
- arch/s390/include/asm/cio.h 2 additions, 0 deletionsarch/s390/include/asm/cio.h
- drivers/char/sysrq.c 1 addition, 1 deletiondrivers/char/sysrq.c
- drivers/s390/block/dasd.c 1 addition, 0 deletionsdrivers/s390/block/dasd.c
- drivers/s390/cio/device.c 27 additions, 16 deletionsdrivers/s390/cio/device.c
- drivers/s390/cio/device.h 1 addition, 0 deletionsdrivers/s390/cio/device.h
- drivers/s390/cio/device_fsm.c 19 additions, 12 deletionsdrivers/s390/cio/device_fsm.c
- drivers/s390/scsi/zfcp_ccw.c 5 additions, 0 deletionsdrivers/s390/scsi/zfcp_ccw.c
Loading
Please register or sign in to comment