summaryrefslogtreecommitdiff
path: root/kernel/power/main.c
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@hobbes.lan>2008-06-12 23:06:58 +0400
committerJesse Barnes <jbarnes@virtuousgeek.org>2008-06-12 23:06:58 +0400
commit53eb2fbeb9e68e1a9a23945de8450999c46270ce (patch)
tree3c50f8690f63b53b3cffbcc226cbbe3c8c6de753 /kernel/power/main.c
parent8344b568f5bdc7ee1bba909de3294c6348c36056 (diff)
parent0e6859d49ff194e01afc229c996e3aefca1a0539 (diff)
downloadlinux-53eb2fbeb9e68e1a9a23945de8450999c46270ce.tar.xz
Merge branch 'suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 into linux-next
Diffstat (limited to 'kernel/power/main.c')
0 files changed, 0 insertions, 0 deletions