From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 6 Feb 2014 22:08:54 +0000 (+0100)
Subject: Merge branches 'acpi-cleanup' and 'acpi-video'
X-Git-Tag: MMI-PSA29.97-13-9~12768^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a2ff34c433932e201ea3c5081335f3beeb2509bd;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branches 'acpi-cleanup' and 'acpi-video'

* acpi-cleanup:
  ACPI / battery: Fix incorrect sscanf() string in acpi_battery_init_alarm()
  ACPI / proc: remove unneeded NULL check
  ACPI / utils: remove a pointless NULL check

* acpi-video:
  ACPI / video: Add HP EliteBook Revolve 810 to the blacklist
---

a2ff34c433932e201ea3c5081335f3beeb2509bd