Merge branch 'ost' into release

Conflicts:
	include/acpi/processor.h

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

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

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

diff --cc include/acpi/processor.h
index 8b668ead6d6e84a55f7cd9c743524cbeace28e1a,a920237f7c62dd3496effd65483a5bfc7286b604..29245c6b5c0e0f6f1faa8bbe554bdf9c9422e08b
--- 1/include/acpi/processor.h
--- 2/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)
  {