Merge branch 'ost' into release
Len Brown [Wed, 16 Dec 2009 07:18:36 +0000 (02:18 -0500)]
Conflicts:
include/acpi/processor.h

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

1  2 
drivers/acpi/processor_core.c
drivers/acpi/processor_perflib.c
include/acpi/processor.h

Simple merge
Simple merge
@@@ -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)
  {