summaryrefslogtreecommitdiff
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-05-12 20:38:42 +0200
committerArnd Bergmann <arnd@arndb.de>2012-05-12 20:38:42 +0200
commit366695ff706669d40459174b1cbb78fca42f4e06 (patch)
tree085d0d288138c5a0bfb203643e99885ff07ddad7 /drivers/pinctrl
parente0373607855d033283b19014c8f14b90b3836924 (diff)
parentc7eea50b980b28f4edaa0cfbdf2456532472bc03 (diff)
parente9d7f4065408e92338a41b809e437c6e043da090 (diff)
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>