summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2007-11-19 23:33:59 +0100
committerLen Brown <len.brown@intel.com>2008-02-02 00:30:53 +0100
commit964756a52f4cf0417d515b7f01eec69db8cb0fe2 (patch)
treea52d13bc9186d473cd89eacc7b72ffd88afa8375 /kernel
parentHibernation: Introduce exportable suspend ioctls header (rev. 2) (diff)
downloadlinux-964756a52f4cf0417d515b7f01eec69db8cb0fe2.tar.xz
linux-964756a52f4cf0417d515b7f01eec69db8cb0fe2.zip
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>
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions