tree 380ac2af17e6e5ce7c68c942fe8df96fd6b92703
parent 417a9ef1f488e3cf92bacc4999e1cbabc0e7cf1a
parent 1468cf0542663f873410b83d8bb61ae779e3a845
author Linus Torvalds <torvalds@linux-foundation.org> 1273265962 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1273265962 -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: sleep: init_set_sci_en_on_resume for Dell Studio 155x
  ACPI: fix acpi_hest_firmware_first_pci() caused oops
  sbshc: acpi_device_class "smbus_host_controller" too long
  power_meter: acpi_device_class "power_meter_resource" too long
  acpi_pad: "processor_aggregator" name too long
  PNP: don't check for conflicts with bridge windows
  ACPI: DMI init_set_sci_en_on_resume for multiple Lenovo ThinkPads
  PNPACPI: compute Address Space length rather than using _LEN
  ACPI: silence kmemcheck false positive