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

diff --cc drivers/acpi/container.c
index f9f8a08,6624c01..e231516
--- 1/drivers/acpi/container.c
--- 2/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@@ -26,10 -26,17 +26,12 @@@
   *
   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   */
 -#include <linux/kernel.h>
 -#include <linux/module.h>
 -#include <linux/init.h>
 -#include <linux/slab.h>
 -#include <linux/types.h>
  #include <linux/acpi.h>
 -#include <acpi/acpi_bus.h>
 -#include <acpi/acpi_drivers.h>
 +
 +#include "internal.h"
  
+ #include "internal.h"
+ 
  #define PREFIX "ACPI: "
  
  #define _COMPONENT                    ACPI_CONTAINER_COMPONENT

diff --cc drivers/acpi/pci_root.c
Simple merge