Merge branch 'acpi-scan'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 14 Apr 2015 10:53:36 +0000 (12:53 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 14 Apr 2015 10:53:36 +0000 (12:53 +0200)
commit03aecbcd71f2d9b9a3bf422a880a1596fd585880
tree56b39978f85621840c1827903c3f578445d0da8e
parent0fe0952b2191b19493adb847eb40c6f88e1caeaf
parent5f2e3274e527ec52413b43b5a9b30422eda4cdd2
Merge branch 'acpi-scan'

* acpi-scan:
  ACPI / scan: Fix NULL pointer dereference in acpi_companion_match()