From: Len Brown <len.brown@intel.com>
Date: Wed, 16 Dec 2009 07:18:36 +0000 (-0500)
Subject: Merge branch 'ost' into release
X-Git-Tag: v2.6.33-rc1~47^2~10
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=8fa79e08f50f4ec1fd8903eca6fd6f36c36dd4c4;p=net-next-2.6.git

Merge branch 'ost' into release

Conflicts:
	include/acpi/processor.h

Signed-off-by: Len Brown <len.brown@intel.com>
---

8fa79e08f50f4ec1fd8903eca6fd6f36c36dd4c4
diff --cc include/acpi/processor.h
index 8b668ead6d6,a920237f7c6..29245c6b5c0
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@@ -294,8 -294,7 +294,8 @@@ static inline void acpi_processor_ffh_c
  #ifdef CONFIG_CPU_FREQ
  void acpi_processor_ppc_init(void);
  void acpi_processor_ppc_exit(void);
- int acpi_processor_ppc_has_changed(struct acpi_processor *pr);
+ int acpi_processor_ppc_has_changed(struct acpi_processor *pr, int event_flag);
 +extern int acpi_processor_get_bios_limit(int cpu, unsigned int *limit);
  #else
  static inline void acpi_processor_ppc_init(void)
  {