tree 3db2bdea9f7ed1235edbc857f53f98ef6058a833
parent fec6489f6d2dda1d83143b644086e49524410809
parent e5a44df85e8d78e5c2d3d2e4f59b460905691e2f
author Linus Torvalds <torvalds@linux-foundation.org> 1321550934 -0200
committer Linus Torvalds <torvalds@linux-foundation.org> 1321550934 -0200

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

* 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