From: Linus Torvalds Date: Wed, 27 Apr 2011 22:20:00 +0000 (-0700) Subject: Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe... X-Git-Tag: upstream/snapshot3+hdmi~10559 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=be6b694713740cea4610754171deec2db9cd668b;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge branch 'pm-fixes' of git://git./linux/kernel/git/rafael/suspend-2.6 * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: ACPI / PM: Avoid infinite recurrence while registering power resources PM / Wakeup: Fix initialization of wakeup-related device sysfs files --- be6b694713740cea4610754171deec2db9cd668b