Rafael J. Wysocki 964756a52f 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>

2008-02-01 18:30:53 -05:00

..

acorn/char

…

acpi

ACPI: Fix mismerge in acpi_hibernation_finish

2008-02-01 18:30:53 -05:00

amba

…

ata

Blackfin pata-bf54x driver: fix compiling bug - no ata_port struct in struct ata_device any more

2008-02-01 12:26:43 -05:00

atm

…

auxdisplay

…

base

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

2008-01-31 09:31:37 +11:00

block

block/sunvdc.c:print_version() must be __devinit

2008-02-01 09:26:32 +01:00

bluetooth

…

cdrom

ide-cd: move lba_to_msf() and msf_to_lba() to <linux/cdrom.h>

2008-02-01 23:09:24 +01:00

char

[AUDIT] add session id to audit messages

2008-02-01 14:06:51 -05:00

clocksource

…

connector

[NETNS]: Consolidate kernel netlink socket destruction.

2008-01-28 15:08:07 -08:00

cpufreq

cpufreq: fix obvious condition statement error

2008-01-30 13:33:34 +01:00

cpuidle

…

crypto

…

dca

…

dio

…

dma

…

edac

Merge branch 'linux-2.6'

2008-01-31 11:25:51 +11:00

eisa

…

firewire

firewire: fw-sbp2: Use sbp2 device-provided mgt orb timeout for logins

2008-01-30 22:22:29 +01:00

firmware

x86: left over fix for leak of early_ioremp in dmi_scan

2008-01-30 13:33:32 +01:00

hid

…

hwmon

…

i2c

…

ide

ide: move hwif_register() call out of ide_probe_port()

2008-02-01 23:09:36 +01:00

ieee1394

ieee1394: ohci1394: don't schedule IT tasklets on IR events

2008-01-30 22:22:21 +01:00

infiniband

[SCSI] remove use_sg_chaining

2008-01-30 13:14:02 -06:00

input

[ALSA] Remove sound/driver.h

2008-01-31 17:29:48 +01:00

isdn

…

leds

…

lguest

lguest: fix mis-merge against hpa's TSS renaming

2008-01-31 19:59:44 +11:00

macintosh

Merge branch 'linux-2.6'

2008-01-31 11:25:51 +11:00

mca

…

md

…

media

[ALSA] Remove sound/driver.h

2008-01-31 17:29:48 +01:00

message

…

mfd

…

misc

…

mmc

…

mtd

…

net

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2008-02-01 21:06:29 +11:00

nubus

…

of

…

oprofile

…

parisc

…

parport

…

pci

pci: allow multiple calls to pcim_enable_device()

2008-02-01 12:26:44 -05:00

pcmcia

…

pnp

git-x86: drivers/pnp/pnpbios/bioscalls.c build fix

2008-01-30 13:32:31 +01:00

power

…

ps3

…

rapidio

Merge branch 'linux-2.6'

2008-01-31 11:25:51 +11:00

rtc

…

s390

[SCSI] zfcp: fix sense_buffer access bug

2008-01-30 13:03:39 -06:00

sbus

…

scsi

ide: update/add my Copyrights

2008-02-01 23:09:33 +01:00

serial

m68knommu: use container_of in mcf.c

2008-02-01 21:00:01 +11:00

sh

…

sn

…

spi

Merge branch 'linux-2.6'

2008-01-31 11:25:51 +11:00

ssb

ssb: Add boardflags_hi field to the sprom data structure

2008-01-28 15:09:52 -08:00

tc

…

telephony

…

uio

…

usb

[ALSA] Remove sound/driver.h

2008-01-31 17:29:48 +01:00

video

x86: cpa: move flush to cpa

2008-01-30 13:34:07 +01:00

virtio

…

w1

…

watchdog

[WATCHDOG] use SGI_HAS_INDYDOG for INDYDOG depends

2008-01-29 12:58:38 +00:00

xen

…

zorro

…

Kconfig

KVM: Move arch dependent files to new directory arch/x86/kvm/

2008-01-30 18:01:18 +02:00

Makefile

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

2008-01-31 09:35:32 +11:00