git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4eb8219 7b9dd47)
Merge branch 'depends/rmk/for-linus' into samsung/dt
authorArnd Bergmann <arnd@arndb.de>
Sat, 7 Jan 2012 12:30:20 +0000 (12:30 +0000)
committerArnd Bergmann <arnd@arndb.de>
Sat, 7 Jan 2012 12:42:17 +0000 (12:42 +0000)
commit237c78beb8a988453bac1993d21f025d070a0d8d
tree9864f0924650770881141359a2d5bac623949789tree | snapshot
parent4eb821999086417ab42a15174b51497122fc406ecommit | diff
parent7b9dd47136c07ffd883aff6926c7b281e4c1eea4commit | 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>
19 files changed:
arch/arm/mach-exynos/Kconfig diff1 | diff2 | blob | history
arch/arm/mach-exynos/Makefile diff1 | diff2 | blob | history
arch/arm/mach-exynos/clock.c diff1 | diff2 | blob | history
arch/arm/mach-exynos/common.c | diff2 | blob | history
arch/arm/mach-s3c2410/mach-bast.c diff1 | diff2 | blob | history
arch/arm/mach-s3c2410/mach-vr1000.c diff1 | diff2 | blob | history
arch/arm/mach-s3c2410/s3c2410.c diff1 | diff2 | blob | history
arch/arm/mach-s3c2440/mach-anubis.c diff1 | diff2 | blob | history
arch/arm/mach-s3c2440/mach-at2440evb.c diff1 | diff2 | blob | history
arch/arm/mach-s3c2440/mach-osiris.c diff1 | diff2 | blob | history
arch/arm/mach-s3c2440/mach-rx1950.c diff1 | diff2 | blob | history
arch/arm/mach-s3c2440/mach-rx3715.c diff1 | diff2 | blob | history
arch/arm/mach-s3c64xx/clock.c diff1 | diff2 | blob | history
arch/arm/mach-s5p64x0/clock-s5p6440.c diff1 | diff2 | blob | history
arch/arm/mach-s5p64x0/clock-s5p6450.c diff1 | diff2 | blob | history
arch/arm/mach-s5p64x0/common.c | diff2 | blob | history
arch/arm/mach-s5pc100/clock.c diff1 | diff2 | blob | history
arch/arm/mach-s5pv210/clock.c diff1 | diff2 | blob | history
arch/arm/mach-s5pv210/common.c diff1 | diff2 | blob | history
Pandora Kernel Repository