Merge branch 'master' of git://git.denx.de/u-boot-arm
Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and
serial.
Conflicts:
arch/arm/dts/exynos5250.dtsi
Signed-off-by:
Tom Rini <trini@ti.com>
Showing
- CREDITS 4 additions, 0 deletionsCREDITS
- MAINTAINERS 5 additions, 2 deletionsMAINTAINERS
- arch/arm/cpu/arm926ejs/mx27/generic.c 10 additions, 0 deletionsarch/arm/cpu/arm926ejs/mx27/generic.c
- arch/arm/cpu/armv7/exynos/Makefile 13 additions, 4 deletionsarch/arm/cpu/armv7/exynos/Makefile
- arch/arm/cpu/armv7/exynos/clock.c 38 additions, 5 deletionsarch/arm/cpu/armv7/exynos/clock.c
- arch/arm/cpu/armv7/exynos/clock_init.h 0 additions, 0 deletionsarch/arm/cpu/armv7/exynos/clock_init.h
- arch/arm/cpu/armv7/exynos/clock_init_exynos4.c 95 additions, 0 deletionsarch/arm/cpu/armv7/exynos/clock_init_exynos4.c
- arch/arm/cpu/armv7/exynos/clock_init_exynos5.c 28 additions, 28 deletionsarch/arm/cpu/armv7/exynos/clock_init_exynos5.c
- arch/arm/cpu/armv7/exynos/common_setup.h 45 additions, 0 deletionsarch/arm/cpu/armv7/exynos/common_setup.h
- arch/arm/cpu/armv7/exynos/dmc_common.c 4 additions, 3 deletionsarch/arm/cpu/armv7/exynos/dmc_common.c
- arch/arm/cpu/armv7/exynos/dmc_init_ddr3.c 16 additions, 11 deletionsarch/arm/cpu/armv7/exynos/dmc_init_ddr3.c
- arch/arm/cpu/armv7/exynos/dmc_init_exynos4.c 213 additions, 0 deletionsarch/arm/cpu/armv7/exynos/dmc_init_exynos4.c
- arch/arm/cpu/armv7/exynos/exynos4_setup.h 192 additions, 205 deletionsarch/arm/cpu/armv7/exynos/exynos4_setup.h
- arch/arm/cpu/armv7/exynos/exynos5_setup.h 13 additions, 15 deletionsarch/arm/cpu/armv7/exynos/exynos5_setup.h
- arch/arm/cpu/armv7/exynos/lowlevel_init.c 73 additions, 0 deletionsarch/arm/cpu/armv7/exynos/lowlevel_init.c
- arch/arm/cpu/armv7/exynos/pinmux.c 40 additions, 0 deletionsarch/arm/cpu/armv7/exynos/pinmux.c
- arch/arm/cpu/armv7/exynos/power.c 50 additions, 0 deletionsarch/arm/cpu/armv7/exynos/power.c
- arch/arm/cpu/armv7/exynos/spl_boot.c 64 additions, 20 deletionsarch/arm/cpu/armv7/exynos/spl_boot.c
- arch/arm/cpu/armv7/omap-common/emif-common.c 3 additions, 0 deletionsarch/arm/cpu/armv7/omap-common/emif-common.c
- arch/arm/cpu/armv7/omap5/hw_data.c 2 additions, 0 deletionsarch/arm/cpu/armv7/omap5/hw_data.c
Loading
Please register or sign in to comment