Merge branches 'depends/pinctrl/devel' and 'depends/rmk/clkdev' into spear/pinctrl

The spear/pinctrl branch has hard dependencies on both the
pinctrl branch and the clkdev branch. We merge those here
to fix it up without having to rebase a branch that has
been pulled into other stable branches already.

Conflicts:
	Documentation/driver-model/devres.txt

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc Documentation/driver-model/devres.txt
index 2a596a4fc23eeb03f1c04cbcc9415b121adfdc04,ef4fa7b423d22904436db0400fa8e69ba7f73d5f,9faac6ae35252e11328fbf61aad798d1dcd25792..950856bd2e39dd105ea39008df8e0b875604689d
--- 1/Documentation/driver-model/devres.txt
--- 2/Documentation/driver-model/devres.txt
--- 3/Documentation/driver-model/devres.txt
+++ b/Documentation/driver-model/devres.txt
@@@@ -276,3 -276,7 -276,7 +276,11 @@@@ REGULATO
     devm_regulator_get()
     devm_regulator_put()
     devm_regulator_bulk_get()
+  
++ CLOCK
++   devm_clk_get()
++   devm_clk_put()
+++
+ +PINCTRL
+ +  devm_pinctrl_get()
+ +  devm_pinctrl_put()

diff --cc drivers/pinctrl/Kconfig
Simple merge

diff --cc drivers/pinctrl/Makefile
Simple merge