git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3010f8c
)
ACPI: Fix mismerge in acpi_hibernation_finish
author
Rafael J. Wysocki
<rjw@sisk.pl>
Mon, 19 Nov 2007 22:33:59 +0000
(23:33 +0100)
committer
Len Brown
<len.brown@intel.com>
Fri, 1 Feb 2008 23:30:53 +0000
(18:30 -0500)
Some code in acpi_hibernation_finish() was moved to acpi_hibernation_leave(),
but the old copy had been left (it's harmless, but also useless). Remove it.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
No differences found