]> 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)
commit3843b7adac3683eb009cb7e3e7bc9f5b4b300905
tree4caa54d641e33a30fb5a540c151202a83678c999
parentcac6fbee08ab25c3ae553d72d633ae7fe45230c2
parent26239e17db953c04a7bdd4278ca5273b3655648b
parent03ca11076a02d6646ab9a5f9225b1ca3f64839dd
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