| commit | 237c78beb8a988453bac1993d21f025d070a0d8d | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Sat Jan 07 12:30:20 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Sat Jan 07 12:42:17 2012 +0000 |
| tree | 9864f0924650770881141359a2d5bac623949789 | |
| parent | 4eb821999086417ab42a15174b51497122fc406e [diff] | |
| parent | 7b9dd47136c07ffd883aff6926c7b281e4c1eea4 [diff] |
Merge branch 'depends/rmk/for-linus' into samsung/dt Conflicts: arch/arm/mach-exynos/Makefile arch/arm/mach-exynos/cpu.c -> common.c arch/arm/mach-exynos/include/mach/entry-macro.S arch/arm/mach-exynos/init.c -> common.c arch/arm/mach-s5p64x0/init.c -> common.c arch/arm/mach-s5pv210/init.c -> common.c Multiple files were moved into common.c files in the rmk/for-linus branch, so this moves over the samsung/dt changes to the new files. Signed-off-by: Arnd Bergmann <arnd@arndb.de>