| commit | 22a37bcb7857541eb2d37806c4744ee2530baa98 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 15 12:39:44 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 15 12:39:44 2008 -0700 |
| tree | 9b3e1a8165908ffa74b2559924ee0f18488667ba | |
| parent | 849c529f57020cc47085400edd5e641d95cd4faf [diff] | |
| parent | 82f06e86117680ada35fdb76c8852268d994cd99 [diff] |
Merge branch 'sbp2-spindown' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'sbp2-spindown' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: ieee1394: sbp2: spin disks down on suspend and shutdown firewire: fw-sbp2: spin disks down on suspend and shutdown ieee1394: sbp2: fix spindown for PL-3507 and TSB42AA9 firmwares firewire: fw-sbp2: fix spindown for PL-3507 and TSB42AA9 firmwares scsi: sd: optionally set power condition in START STOP UNIT