tree 4321cc45b60988a28dc384c1b189f33d4c95d830
parent 5a4c8d75f4ff512c42065a7125d02dffe27966ce
parent 0c570cdeb8fdfcb354a3e9cd81bfc6a09c19de0c
author Linus Torvalds <torvalds@linux-foundation.org> 1254323484 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1254323484 -0700

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