Merge branch 'samsung/dt' into samsung/cleanup
authorArnd Bergmann <arnd@arndb.de>
Mon, 9 Jan 2012 16:01:00 +0000 (16:01 +0000)
committerArnd Bergmann <arnd@arndb.de>
Mon, 9 Jan 2012 16:01:00 +0000 (16:01 +0000)
commita07613a54d700a974f3a4a657da78ef5d097315d
treee4bc91713e02fa6d8f08b07de53ea8f905593dfa
parent65db039bf7402f0a5b19cbf6dcff55ebea433b8b
parent928a11ba36f999436915ea2b1eadf54301f93059
Merge branch 'samsung/dt' into samsung/cleanup

Conflicts:
arch/arm/mach-s3c64xx/Makefile
arch/arm/mach-s5pc100/Makefile
arch/arm/mach-s5pv210/Makefile

Pull in previously resolved conflicts:

The Makefiles were reorganized in the "rmk/restart" series and modified
in the "samsung/cleanup series". This also pulls in the other conflict
resolutions from the restart series against the samsung/dt series.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
18 files changed:
arch/arm/mach-exynos/Makefile
arch/arm/mach-exynos/clock.c
arch/arm/mach-exynos/mach-nuri.c
arch/arm/mach-exynos/mach-smdkv310.c
arch/arm/mach-exynos/mach-universal_c210.c
arch/arm/mach-s3c64xx/Makefile
arch/arm/mach-s3c64xx/clock.c
arch/arm/mach-s5p64x0/Makefile
arch/arm/mach-s5p64x0/clock-s5p6440.c
arch/arm/mach-s5p64x0/clock-s5p6450.c
arch/arm/mach-s5pc100/Makefile
arch/arm/mach-s5pc100/clock.c
arch/arm/mach-s5pv210/Makefile
arch/arm/mach-s5pv210/clock.c
arch/arm/mach-s5pv210/mach-aquila.c
arch/arm/mach-s5pv210/mach-goni.c
arch/arm/mach-s5pv210/mach-smdkv210.c
drivers/mmc/host/sdhci-s3c.c