Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git

# Conflicts:
#	drivers/of/dynamic.c
#	drivers/of/property.c

diff --cc drivers/of/dynamic.c
index 4d57a4e34105466f8997b210271b231d216cb9b5,43f4e2c93bd25717b7be2cf4c5468002738ea8b5..ce5161853b834e9c9a67896c09eb2f45b8ab4d74
--- 1/drivers/of/dynamic.c
--- 2/drivers/of/dynamic.c
+++ b/drivers/of/dynamic.c
@@@ -9,7 -9,7 +9,8 @@@
  
  #define pr_fmt(fmt)   "OF: " fmt
  
 +#include <linux/device.h>
+ #include <linux/cleanup.h>
  #include <linux/of.h>
  #include <linux/spinlock.h>
  #include <linux/slab.h>

diff --cc drivers/of/property.c
index aaf3ce74f85ca349b4f8ed647d70fa8b956dd2a2,4ede45001025c25d2a548e8400088e250ae585d2..6d5ae58a7ac90a00d7546d5d6072e6a392d8ace7
--- 1/drivers/of/property.c
--- 2/drivers/of/property.c
+++ b/drivers/of/property.c
@@@ -1252,8 -1242,7 +1242,9 @@@ DEFINE_SIMPLE_PROP(backlight, "backligh
  DEFINE_SIMPLE_PROP(panel, "panel", NULL)
  DEFINE_SIMPLE_PROP(msi_parent, "msi-parent", "#msi-cells")
  DEFINE_SIMPLE_PROP(post_init_providers, "post-init-providers", NULL)
 +DEFINE_SIMPLE_PROP(access_controllers, "access-controllers", "#access-controller-cells")
 +DEFINE_SIMPLE_PROP(pses, "pses", "#pse-cells")
+ DEFINE_SIMPLE_PROP(power_supplies, "power-supplies", NULL)
  DEFINE_SUFFIX_PROP(regulators, "-supply", NULL)
  DEFINE_SUFFIX_PROP(gpio, "-gpio", "#gpio-cells")
  
@@@ -1359,7 -1348,7 +1350,8 @@@ static const struct supplier_bindings o
        { .parse_prop = parse_backlight, },
        { .parse_prop = parse_panel, },
        { .parse_prop = parse_msi_parent, },
 +      { .parse_prop = parse_pses, },
+       { .parse_prop = parse_power_supplies, },
        { .parse_prop = parse_gpio_compat, },
        { .parse_prop = parse_interrupts, },
        { .parse_prop = parse_regulators, },