From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 24 Oct 2012 20:18:22 +0000 (+0200)
Subject: Merge branch 'acpi-next' into linux-next
X-Git-Tag: next-20121025~36^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ec06e63e40a3fb5a95f7252853744f116ffd1af2;p=karo-tx-linux.git

Merge branch 'acpi-next' into linux-next

* acpi-next:
  ACPI / PM: Fix device PM kernedoc comments and #ifdefs
  ACPI: move acpi_no_s4_hw_signature() declaration into #ifdef CONFIG_HIBERNATION
  ACPI / Sleep: add acpi_sleep=nonvs_s3 parameter
  ACPI: Remove unused lockable in acpi_device_flags
  ACPI: Fix stale pointer access to flags.lockable
  ACPI: Fix a hard coding style when determining if a device is a container.
  ACPI / x86: Add quirk for "CheckPoint P-20-00" to not use bridge _CRS_ info
  ACPI / processor: prevent cpu from becoming online
  ACPI: strict_strtoul() and printk() cleanup in acpi_pad
  ACPI: dock: Remove redundant ACPI NS walk
  ACPI / EC: Don't count a SCI interrupt as a false one
  ACPI: Remove the useless check in osl.c
  ACPI / EC: Add more debug info and trivial code cleanup
  ACPI / EC: Cleanup the member name for spinlock/mutex in struct
---

ec06e63e40a3fb5a95f7252853744f116ffd1af2