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

Conflicts:
	Documentation/driver-model/devres.txt
	drivers/pinctrl/core.c

diff --cc Documentation/driver-model/devres.txt
index 9faac6ae35252e11328fbf61aad798d1dcd25792,ef4fa7b423d22904436db0400fa8e69ba7f73d5f..950856bd2e39dd105ea39008df8e0b875604689d
--- 1/Documentation/driver-model/devres.txt
--- 2/Documentation/driver-model/devres.txt
+++ b/Documentation/driver-model/devres.txt
@@@ -277,6 -277,6 +277,10 @@@ REGULATO
    devm_regulator_put()
    devm_regulator_bulk_get()
  
 +CLOCK
 +  devm_clk_get()
 +  devm_clk_put()
++
+ PINCTRL
+   devm_pinctrl_get()
+   devm_pinctrl_put()