Merge branch 'misc' into release

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/acpi/Kconfig
Simple merge

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

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

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

diff --cc drivers/acpi/sleep.c
index e807f41,05dc42c..721d93b
--- 1/drivers/acpi/sleep.c
--- 2/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@@ -25,10 -25,8 +25,10 @@@
  #include "internal.h"
  #include "sleep.h"
  
- u8 sleep_states[ACPI_S_STATE_COUNT];
+ static u8 sleep_states[ACPI_S_STATE_COUNT];
  
 +static u32 acpi_target_sleep_state = ACPI_STATE_S0;
 +
  static void acpi_sleep_tts_switch(u32 acpi_state)
  {
        union acpi_object in_arg = { ACPI_TYPE_INTEGER };

diff --cc include/acpi/acpiosxf.h
Simple merge

diff --cc include/linux/acpi.h
Simple merge