]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3010f8c) | patch
ACPI: Fix mismerge in acpi_hibernation_finish
authorRafael J. Wysocki <rjw@sisk.pl>
Mon, 19 Nov 2007 22:33:59 +0000 (23:33 +0100)
committerLen Brown <len.brown@intel.com>
Fri, 1 Feb 2008 23:30:53 +0000 (18:30 -0500)
commit964756a52f4cf0417d515b7f01eec69db8cb0fe2
treea52d13bc9186d473cd89eacc7b72ffd88afa8375tree | snapshot
parent3010f8caa48ed38679cc32b0d8e84b82cb8d9980commit | diff
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>
drivers/acpi/sleep/main.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.