From: Linus Torvalds Date: Tue, 29 Nov 2011 22:43:22 +0000 (-0800) Subject: Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm X-Git-Tag: v3.2-rc4~8 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8cd7920370a3715ccbd1c98bf33f172b8837dc0b;p=users%2Fdwmw2%2Flinux.git Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: PM: Update comments describing device power management callbacks PM / Sleep: Update documentation related to system wakeup PM / Runtime: Make documentation follow the new behavior of irq_safe PM / Sleep: Correct inaccurate information in devices.txt PM / Domains: Document how PM domains are used by the PM core PM / Hibernate: Do not leak memory in error/test code paths --- 8cd7920370a3715ccbd1c98bf33f172b8837dc0b