Merge branches 'acpi-gpe', 'acpi-video', 'acpi-tpm', 'acpi-ac' and 'acpi-battery'

* acpi-gpe:
  ACPI / EC: disable GPE before removing GPE handler
  ACPI / Button: Fix enabling button GPEs twice

* acpi-video:
  ACPI: Blacklist Win8 OSI for some HP laptop 2013 models
  ACPI / video: Fix typo in video_detect.c

* acpi-tpm:
  ACPI / TPM: fix memory leak when walking ACPI namespace

* acpi-ac:
  ACPI / AC: change notification handler type to ACPI_ALL_NOTIFY

* acpi-battery:
  ACPI / Battery: Add a _BIX quirk for NEC LZ750/LS

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

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

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

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

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

diff --cc drivers/char/tpm/tpm_ppi.c
Simple merge