Merge branch 'device-properties'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 1 Sep 2015 01:45:05 +0000 (03:45 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 1 Sep 2015 01:45:05 +0000 (03:45 +0200)
commit498012511a060575a56551d28a10bb392aa361b5
treed9dd9060eb6b3037804eca8e22056e7cdb1a26dd
parent5d2a1a927d487d6bb60c87b837d82702d8ebcaad
parent4bf011815f2e093c7f60004f4f5683cf40b905b9
Merge branch 'device-properties'

* device-properties:
  device property: check fwnode type in to_of_node()
  device property: attach 'else if' to the proper 'if'
  device property: fallback to pset when gettng one string
  device property: fix potential NULL pointer dereference