git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2819f8 f613e22)
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)
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>

Trivial merge
Pandora Kernel Repository