tree f1825e060e5b51374ee79388b47be662c9a0b297
parent 077f893bd942b23d8e27c90f8f60018ce21010a0
parent 545d6e189a41c94c11f55045a771118eccc9d9eb
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1365417116 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1365417116 +0200

Merge branch 'acpi-assorted' into linux-next

* acpi-assorted:
  PCI / ACPI: Don't query OSC support with all possible controls
  ACPI / processor_thermal: avoid null pointer deference error
  ACPI / fan: avoid null pointer deference error
  ACPI / video: Fix applying indexed initial brightness value.
  ACPI / video: Make logic a little easier to understand.
  ACPI / video: Fix brightness control initialization for some laptops.
  ACPI: Use resource_size() in osl.c
  ACPI / acpi_pad: Used PTR_RET
  ACPI: suppress compiler warning in container.c
  ACPI: suppress compiler warning in battery.c
  ACPI: suppress compiler warnings in processor_throttling.c
  ACPI: suppress compiler warnings in button.c
  ACPI: replace kmalloc+memcpy with kmemdup
  ACPI: Remove acpi_pci_bind_root() definition
  ACPI video: ignore BIOS backlight value for HP dm4