Merge back new device properties material for v4.7.

diff --cc drivers/base/property.c
index 7f692ac,210423d..f38c21d
--- 1/drivers/base/property.c
--- 2/drivers/base/property.c
+++ b/drivers/base/property.c
@@@ -19,9 -19,14 +19,14 @@@
  #include <linux/etherdevice.h>
  #include <linux/phy.h>
  
+ struct property_set {
+       struct fwnode_handle fwnode;
+       struct property_entry *properties;
+ };
+ 
  static inline bool is_pset_node(struct fwnode_handle *fwnode)
  {
 -      return fwnode && fwnode->type == FWNODE_PDATA;
 +      return !IS_ERR_OR_NULL(fwnode) && fwnode->type == FWNODE_PDATA;
  }
  
  static inline struct property_set *to_pset_node(struct fwnode_handle *fwnode)