From: Len Brown <len.brown@intel.com>
Date: Tue, 26 Oct 2010 18:51:00 +0000 (-0400)
Subject: Merge branch 'misc' into release
X-Git-Tag: v2.6.37-rc1~100^2
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=7e31842441776b4d6ec7fd916c91663ad05b7814;p=net-next-2.6.git

Merge branch 'misc' into release
---

7e31842441776b4d6ec7fd916c91663ad05b7814
diff --cc drivers/acpi/sleep.c
index e807f4196f8,05dc42c2a46..721d93b3cee
--- a/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 };