From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 30 Sep 2009 15:11:24 +0000 (-0700)
Subject: Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe... 
X-Git-Tag: v2.6.32-rc3~62
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9c1fe834c1bd7725b411055c66886b64c928083d;p=~emulex%2Finfiniband.git

Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM / yenta: Fix cardbus suspend/resume regression
  PM / PCMCIA: Drop second argument of pcmcia_socket_dev_suspend()
---

9c1fe834c1bd7725b411055c66886b64c928083d