From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 12 May 2012 18:38:42 +0000 (+0200)
Subject: Merge branches 'depends/pinctrl/devel' and 'depends/rmk/clkdev' into spear/pinctrl
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=366695ff706669d40459174b1cbb78fca42f4e06;p=linux-beck.git

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>
---

366695ff706669d40459174b1cbb78fca42f4e06
diff --cc Documentation/driver-model/devres.txt
index 2a596a4fc23e,ef4fa7b423d2,9faac6ae3525..950856bd2e39
--- a/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()