From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Jul 2008 19:39:44 +0000 (-0700)
Subject: Merge branch 'sbp2-spindown' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee139... 
X-Git-Tag: v2.6.27-rc1~1073
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=22a37bcb7857541eb2d37806c4744ee2530baa98;p=linux-2.6-omap-h63xx.git

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
---

22a37bcb7857541eb2d37806c4744ee2530baa98