Merge branch 'spear/dt' into spear/clock
authorArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 15:31:45 +0000 (17:31 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 15:31:45 +0000 (17:31 +0200)
commit66a2886d867343eff6bf2646bea2c923d0cbf620
treead44dcca4fa410ab2c16b4964f6c19571421b4df
parentd2819f80d465672b09c2f4cb52303b7f951c4d0f
parentf613e220aebfafb653f7ce264950c15c99e27f2a
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>
13 files changed:
arch/arm/boot/dts/spear300-evb.dts
arch/arm/boot/dts/spear310-evb.dts
arch/arm/boot/dts/spear320-evb.dts
arch/arm/mach-spear3xx/include/mach/generic.h
arch/arm/mach-spear3xx/include/mach/misc_regs.h
arch/arm/mach-spear3xx/include/mach/spear.h
arch/arm/mach-spear3xx/spear300.c
arch/arm/mach-spear3xx/spear310.c
arch/arm/mach-spear3xx/spear320.c
arch/arm/mach-spear3xx/spear3xx.c
arch/arm/mach-spear6xx/include/mach/misc_regs.h
arch/arm/mach-spear6xx/spear6xx.c
arch/arm/plat-spear/time.c