tree 1ef931c2287e376f8fef37cea89f7a951d9d3b00
parent 90ca9a2ff4d6b89b6939c3ece19f8fed1eecdbab
parent 0466684907ea1695eeef98cb28ca3399882ecc0a
author Linus Torvalds <torvalds@g5.osdl.org> 1152569678 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1152569678 -0700

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:
  ACPI: ACPI_DOCK: Initialize the atomic notifier list
  ACPI: acpi_os_allocate() fixes
  ACPI: SBS: fix initialization, sem2mutex
  ACPI: add 'const' to several ACPI file_operations
  ACPI: delete some defaults from ACPI Kconfig
  ACPI: "Device `[%s]' is not power manageable" make message debug only
  ACPI: ACPI_DOCK Kconfig
  Revert "Revert "ACPI: dock driver""
  ACPI: acpi_os_get_thread_id() returns current
  ACPI: ACPICA 20060707