Merge remote-tracking branch 'gpio/for-next'

Conflicts:
	Documentation/driver-model/devres.txt

diff --cc Documentation/driver-model/devres.txt
index d483f2cf221ba5c58d083e51807257dcec345491,10b8c5d2c79701e9d33e1f8e31ba1339e056973f..3eb25fd3edb191a5e22a5fc36b910d7fa1164404
--- 1/Documentation/driver-model/devres.txt
--- 2/Documentation/driver-model/devres.txt
+++ b/Documentation/driver-model/devres.txt
@@@ -310,7 -309,9 +310,14 @@@ SLAVE DMA ENGIN
  SPI
    devm_spi_register_master()
  
 +MDIO
 +  devm_mdiobus_alloc()
 +  devm_mdiobus_alloc_size()
 +  devm_mdiobus_free()
++
+ GPIO
+   devm_gpiod_get()
+   devm_gpiod_get_index()
+   devm_gpiod_get_optional()
+   devm_gpiod_get_index_optional()
+   devm_gpiod_put()

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/mfd/Kconfig
Simple merge

diff --cc drivers/mfd/stmpe.c
Simple merge

diff --cc include/linux/mfd/stmpe.h
Simple merge