aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-27 15:20:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-27 15:20:00 -0700
commitbe6b694713740cea4610754171deec2db9cd668b (patch)
tree765680b0996f8af1d4263fa83daeb58935238841 /init
parent0fd97ab48971735e38677cfdab64e4db581530f8 (diff)
parent7bed50c5edf5cba8dd515a31191cbfb6065ddc85 (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
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions