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

diff --cc MAINTAINERS
Simple merge

diff --cc include/linux/gpio/property.h
index 1a14e239221f7e9aec06b510d450c9f30b34fc2c,832a60c2e0b99e9c887a777edd71b0a4ccf7e114..0d220930800276a21b5ba96a68371ce66fc4ae3e
--- 1/include/linux/gpio/property.h
--- 2/include/linux/gpio/property.h
+++ b/include/linux/gpio/property.h
@@@ -2,8 -2,11 +2,10 @@@
  #ifndef __LINUX_GPIO_PROPERTY_H
  #define __LINUX_GPIO_PROPERTY_H
  
 -#include <dt-bindings/gpio/gpio.h> /* for GPIO_* flags */
  #include <linux/property.h>
  
+ struct software_node;
+ 
  #define PROPERTY_ENTRY_GPIO(_name_, _chip_node_, _idx_, _flags_) \
        PROPERTY_ENTRY_REF(_name_, _chip_node_, _idx_, _flags_)