From: Linus Torvalds Date: Mon, 16 Aug 2010 00:37:07 +0000 (-0700) Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux... X-Git-Tag: v2.6.36-rc1~1 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2245ba2a3a975656bb303dfaa115accaa4667083;p=~shefty%2Frdma-dev.git Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: gcc-4.6: ACPI: fix unused but set variables in ACPI ACPI thermal: make procfs I/F depend on CONFIG_ACPI_PROCFS ACPI video: make procfs I/F depend on CONFIG_ACPI_PROCFS ACPI processor: remove deprecated ACPI procfs I/F ACPI power_resource: remove unused procfs I/F ACPI: remove deprecated ACPI procfs I/F ACPI: introduce drivers/acpi/sysfs.c ACPI: introduce module parameter acpi.aml_debug_output ACPI: introduce drivers/acpi/debugfs.c ACPI, APEI, ERST debug support ACPI, APEI, Manage GHES as platform devices ACPI, APEI, Rename CPER and GHES severity constants ACPI, APEI, Fix a typo of error path of apei_resources_request ACPI / ACPICA: Fix reference counting problems with GPE handlers ACPI: Add the check of ADR flag in course of finding ACPI handle for PCI device ACPI / Sleep: Drop acpi_suspend_finish() ACPI / Sleep: Consolidate suspend and hibernation routines ACPI / Wakeup: Simplify enabling of wakeup devices ACPI / Sleep: Rework enabling wakeup devices ACPI / Sleep: Free NVS copy if suspending of devices fails Fixed up totally buggered "ACPI: fix unused but set variables in ACPI" patch that doesn't even compile in the merge. Thanks to Sedat Dilek for noticing the breakage before I even pulled. And a big "Grrr.." at Len for not even bothering to compile the tree before asking me to pull. --- 2245ba2a3a975656bb303dfaa115accaa4667083 diff --cc drivers/acpi/power.c index f74d3b31e5c,cf073aa0709..844c155aeb0 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c @@@ -253,9 -242,7 +242,8 @@@ static int acpi_power_off_device(acpi_h acpi_status status = AE_OK; struct acpi_power_resource *resource = NULL; struct list_head *node, *next; + struct acpi_power_reference *ref; - result = acpi_power_get_context(handle, &resource); if (result) return result;