diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-08 18:35:22 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-08 18:35:22 +0200 |
commit | ed7ba2ef09254b2fd9698708b407f4652d26e36a (patch) | |
tree | d16ea988b54d906704003ab086498c184afe1a1f /drivers/power/Makefile | |
parent | intel-iommu: Fix intel_iommu_unmap_range() with size 0 (diff) | |
parent | PM: Clear -EAGAIN in dpm_prepare (diff) | |
download | linux-ed7ba2ef09254b2fd9698708b407f4652d26e36a.tar.xz linux-ed7ba2ef09254b2fd9698708b407f4652d26e36a.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM: Clear -EAGAIN in dpm_prepare
x86: Fix resume from suspend when CONFIG_CC_STACKPROTECTOR
Diffstat (limited to 'drivers/power/Makefile')
0 files changed, 0 insertions, 0 deletions