Merge branch 'blk-softirq' of git://brick.kernel.dk/data/git/linux-2.6-block
Manual merge for trivial #include changes
Showing
- block/ll_rw_blk.c 105 additions, 1 deletionblock/ll_rw_blk.c
- drivers/block/cciss.c 46 additions, 26 deletionsdrivers/block/cciss.c
- drivers/ide/ide-io.c 35 additions, 7 deletionsdrivers/ide/ide-io.c
- drivers/ide/ide-probe.c 2 additions, 0 deletionsdrivers/ide/ide-probe.c
- drivers/scsi/scsi.c 8 additions, 101 deletionsdrivers/scsi/scsi.c
- drivers/scsi/scsi_lib.c 36 additions, 0 deletionsdrivers/scsi/scsi_lib.c
- drivers/scsi/scsi_priv.h 1 addition, 0 deletionsdrivers/scsi/scsi_priv.h
- include/linux/blkdev.h 18 additions, 3 deletionsinclude/linux/blkdev.h
- include/linux/ide.h 1 addition, 0 deletionsinclude/linux/ide.h
- include/linux/interrupt.h 1 addition, 1 deletioninclude/linux/interrupt.h
Loading
Please register or sign in to comment