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

Merge branch 'spear/dt' into spear/clock

Conflicts:
	arch/arm/mach-spear3xx/clock.c
	arch/arm/mach-spear3xx/include/mach/generic.h
	arch/arm/mach-spear3xx/include/mach/misc_regs.h
	arch/arm/mach-spear3xx/spear320.c
	arch/arm/mach-spear6xx/clock.c
	arch/arm/mach-spear6xx/include/mach/misc_regs.h

Resolve even more merge conflicts.

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

66a2886d867343eff6bf2646bea2c923d0cbf620
Reading git-diff-tree failed