From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 10 Sep 2007 21:38:15 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... 
X-Git-Tag: v2.6.23-rc6~13
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e032d93e1a3b2facf17029a643faf141dcea5f70;p=~shefty%2Frdma-dev.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: fw-ohci: ignore failure of pci_set_power_state (fix suspend regression)
---

e032d93e1a3b2facf17029a643faf141dcea5f70