]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Sep 2009 15:11:24 +0000 (08:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Sep 2009 15:11:24 +0000 (08:11 -0700)
commit9c1fe834c1bd7725b411055c66886b64c928083d
tree4321cc45b60988a28dc384c1b189f33d4c95d830
parent5a4c8d75f4ff512c42065a7125d02dffe27966ce
parent0c570cdeb8fdfcb354a3e9cd81bfc6a09c19de0c
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()