From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Mon, 19 Nov 2007 22:33:59 +0000 (+0100)
Subject: ACPI: Fix mismerge in acpi_hibernation_finish
X-Git-Tag: v2.6.25-rc1~1073^2~32
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=964756a52f4cf0417d515b7f01eec69db8cb0fe2;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed