]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'acpi-cleanup' and 'acpi-video'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 6 Feb 2014 22:08:54 +0000 (23:08 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 6 Feb 2014 22:08:54 +0000 (23:08 +0100)
commitd0cd4b2fb9c98c3e7a4d3caa308414ad8db2ca40
tree4caa54d641e33a30fb5a540c151202a83678c999
parent887ac6c18bd14b16b17c2c9b2f0717651a9e7ac8
parent801d728f57ce7ca3798efaa37bc658f96d9664d8
parenta85ba5ea74a80f409c280157373f937dc39ae7d6
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