projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f87307 3c31b52)
Merge branch 'async-scsi-resume' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Apr 2014 00:23:52 +0000 (17:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Apr 2014 00:23:52 +0000 (17:23 -0700)
Pull async SCSI resume support from Dan Williams:
 "Allow disks and other devices to resume in parallel.

  This provides a tangible speed up for a non-esoteric use case (laptop
  resume):

    https://01.org/suspendresume/blogs/tebrandt/2013/hard-disk-resume-optimization-simpler-approach"

* 'async-scsi-resume' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci:
  scsi: async sd resume

1  2 
drivers/scsi/scsi.c patch | diff1 | diff2 | blob | history
drivers/scsi/scsi_scan.c patch | diff1 | diff2 | blob | history
drivers/scsi/sd.c patch | diff1 | diff2 | blob | history

diff --cc drivers/scsi/scsi.c
Simple merge
diff --cc drivers/scsi/scsi_scan.c
Simple merge
diff --cc drivers/scsi/sd.c
Simple merge
Domain: System / Kernel;