Commits
![Arnd Bergmann](https://secure.gravatar.com/avatar/f1897d8cf2fe6c8e75a0c9add2d05b0c.jpg?s=96&d=mm)
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>