Merge branch 'pm-cpufreq' into linux-next

* pm-cpufreq:
  cpufreq: Makefile: fix compilation for davinci platform
Merge branch 'acpi-scan' into linux-next

* acpi-scan:
  ACPI / PNP: add soc_button_array device ID to PNP IDs list
Merge branch 'pm-apm' into linux-next

* pm-apm:
  x86, apm: Remove unused variable