Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block: [PATCH] scsi: kill overeager "not-ready" messages [PATCH] it821x: fix ide dma setup bug [PATCH] ide: if the id fields looks screwy, disable DMA [PATCH] ide: option to disable cache flushes for buggy drives
Showing
- drivers/ide/ide-disk.c 1 addition, 1 deletiondrivers/ide/ide-disk.c
- drivers/ide/ide-dma.c 1 addition, 1 deletiondrivers/ide/ide-dma.c
- drivers/ide/ide.c 4 additions, 1 deletiondrivers/ide/ide.c
- drivers/ide/pci/it821x.c 8 additions, 3 deletionsdrivers/ide/pci/it821x.c
- drivers/scsi/scsi_ioctl.c 1 addition, 4 deletionsdrivers/scsi/scsi_ioctl.c
- include/linux/ide.h 1 addition, 0 deletionsinclude/linux/ide.h
Loading
Please register or sign in to comment