From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 Apr 2012 04:43:48 +0000 (+1000)
Subject: Merge remote-tracking branch 'pinctrl/for-next'
X-Git-Tag: next-20120430~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=807e01ef9596598fa3e2bb03a87662985ad16e02;p=karo-tx-linux.git

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

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

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