Merge branch 'misc' into release
Len Brown [Tue, 26 Oct 2010 18:51:00 +0000 (14:51 -0400)]
1  2 
MAINTAINERS
drivers/acpi/Kconfig
drivers/acpi/dock.c
drivers/acpi/osl.c
drivers/acpi/processor_driver.c
drivers/acpi/sleep.c
include/acpi/acpiosxf.h
include/linux/acpi.h

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
  #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 };
Simple merge
Simple merge