Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

Browse source

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] hpsa: Disable ASPM
  [SCSI] aacraid: controller hangs if kernel uses non-default ASPM policy
  [SCSI] mpt2sas: add missing allocation.
  [SCSI] Silencing 'killing requests for dead queue'
  [SCSI] fix WARNING: at drivers/scsi/scsi_lib.c:1704

...

This commit is contained in:

Linus Torvalds 2011-11-17 15:28:54 -02:00

parent fec6489f6d e5a44df85e

commit a9098b3726

5 changed files with 17 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

drivers/scsi/aacraid/linit.c

View file

5

drivers/scsi/hpsa.c

View file

5

drivers/scsi/mpt2sas/mpt2sas_scsih.c

View file

3

drivers/scsi/scsi_lib.c

View file

6

drivers/scsi/scsi_scan.c

View file