tree 085d0d288138c5a0bfb203643e99885ff07ddad7
parent e0373607855d033283b19014c8f14b90b3836924
parent c7eea50b980b28f4edaa0cfbdf2456532472bc03
parent e9d7f4065408e92338a41b809e437c6e043da090
author Arnd Bergmann <arnd@arndb.de> 1336847922 +0200
committer Arnd Bergmann <arnd@arndb.de> 1336847922 +0200

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>