From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 14 May 2012 13:33:42 +0000 (+0200)
Subject: Merge branch 'spear/pinctrl' into spear/clock
X-Git-Tag: v3.5-rc1~71^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2819f80d465672b09c2f4cb52303b7f951c4d0f;p=pandora-kernel.git

Merge branch 'spear/pinctrl' into spear/clock

Conflicts:
	arch/arm/mach-spear3xx/Makefile
	arch/arm/mach-spear3xx/clock.c
	arch/arm/mach-spear3xx/include/mach/generic.h
	arch/arm/mach-spear6xx/clock.c
	arch/arm/plat-spear/Makefile
	drivers/pinctrl/core.c

This resolves some annoying merge conflicts.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

d2819f80d465672b09c2f4cb52303b7f951c4d0f
Reading git-diff-tree failed