| commit | 66a2886d867343eff6bf2646bea2c923d0cbf620 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon May 14 17:31:45 2012 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon May 14 17:31:45 2012 +0200 |
| tree | ad44dcca4fa410ab2c16b4964f6c19571421b4df | |
| parent | d2819f80d465672b09c2f4cb52303b7f951c4d0f [diff] | |
| parent | f613e220aebfafb653f7ce264950c15c99e27f2a [diff] |
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>