Merge branch 'acpi-misc'

* acpi-misc:
  ACPI: dock: fix some coding style issues
  ACPI: sysfs: fix some coding style issues
  ACPI: PM: add a missed blank line after declarations
  ACPI: custom_method: fix a coding style issue
  ACPI: CPPC: fix some coding style issues
  ACPI: button: fix some coding style issues
  ACPI: battery: fix some coding style issues
  ACPI: acpi_pad: add a missed blank line after declarations
  ACPI: LPSS: add a missed blank line after declarations
  ACPI: ipmi: remove useless return statement for void function
  ACPI: processor: fix some coding style issues
  ACPI: APD: fix a block comment align issue
  ACPI: AC: fix some coding style issues
  ACPI: fix various typos in comments

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

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

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

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

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

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

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