From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Nov 2011 17:28:54 +0000 (-0200)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a9098b372606a15745cdeb012de4ee91c0df82c4;p=openwrt%2Fstaging%2Fblogic.git

Merge git://git./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
---

a9098b372606a15745cdeb012de4ee91c0df82c4