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-Tag: v3.5-rc1~152^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=366695ff706669d40459174b1cbb78fca42f4e06;p=pandora-kernel.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
Reading git-diff-tree failed