| commit | 964756a52f4cf0417d515b7f01eec69db8cb0fe2 | |
| author | Rafael J. Wysocki <rjw@sisk.pl> | |
| Mon, 19 Nov 2007 22:33:59 +0000 (19 23:33 +0100) | ||
| committer | Len Brown <len.brown@intel.com> | |
| Fri, 1 Feb 2008 23:30:53 +0000 (1 18:30 -0500) | ||
| tree | a52d13bc9186d473cd89eacc7b72ffd88afa8375 | treesnapshot (tar.gz zip) |
| parent | 3010f8caa48ed38679cc32b0d8e84b82cb8d9980 | commitdiff |
ACPI: Fix mismerge in acpi_hibernation_finish
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>
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>
| drivers/acpi/sleep/main.c | diffblobblamehistory |