From: Linus Torvalds Date: Fri, 25 Feb 2011 23:15:17 +0000 (-0800) Subject: Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=493f3358cb2;p=mv-sheeva.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: Make ACPI wakeup from S5 work again when CONFIG_PM_SLEEP is unset --- 493f3358cb289ccf716c5a14fa5bb52ab75943e5