| commit | be6b694713740cea4610754171deec2db9cd668b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 27 15:20:00 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 27 15:20:00 2011 -0700 |
| tree | 765680b0996f8af1d4263fa83daeb58935238841 | |
| parent | 0fd97ab48971735e38677cfdab64e4db581530f8 [diff] | |
| parent | 7bed50c5edf5cba8dd515a31191cbfb6065ddc85 [diff] |
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: ACPI / PM: Avoid infinite recurrence while registering power resources PM / Wakeup: Fix initialization of wakeup-related device sysfs files