Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts: drivers/video/exynos_fb.c
Showing
- MAKEALL 1 addition, 1 deletionMAKEALL
- Makefile 4 additions, 2 deletionsMakefile
- README 89 additions, 6 deletionsREADME
- api/api_display.c 2 additions, 2 deletionsapi/api_display.c
- arch/arm/cpu/arm926ejs/spear/spear600.c 17 additions, 20 deletionsarch/arm/cpu/arm926ejs/spear/spear600.c
- arch/arm/cpu/arm926ejs/spear/spl_boot.c 1 addition, 1 deletionarch/arm/cpu/arm926ejs/spear/spl_boot.c
- arch/arm/cpu/pxa/Makefile 0 additions, 1 deletionarch/arm/cpu/pxa/Makefile
- arch/blackfin/include/asm/posix_types.h 0 additions, 3 deletionsarch/blackfin/include/asm/posix_types.h
- arch/m68k/lib/interrupts.c 1 addition, 1 deletionarch/m68k/lib/interrupts.c
- arch/nds32/lib/interrupts.c 1 addition, 1 deletionarch/nds32/lib/interrupts.c
- arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c 1 addition, 1 deletionarch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
- arch/powerpc/cpu/mpc8xx/Makefile 0 additions, 1 deletionarch/powerpc/cpu/mpc8xx/Makefile
- arch/powerpc/cpu/mpc8xxx/fdt.c 5 additions, 0 deletionsarch/powerpc/cpu/mpc8xxx/fdt.c
- arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c 34 additions, 37 deletionsarch/powerpc/cpu/ppc4xx/44x_spd_ddr.c
- arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c 99 additions, 102 deletionsarch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c
- arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c 4 additions, 11 deletionsarch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c
- arch/powerpc/lib/ticks.S 11 additions, 6 deletionsarch/powerpc/lib/ticks.S
- board/LEOX/elpt860/u-boot.lds.debug 1 addition, 1 deletionboard/LEOX/elpt860/u-boot.lds.debug
- board/Marvell/common/memory.c 5 additions, 5 deletionsboard/Marvell/common/memory.c
- board/Marvell/db64360/mpsc.c 1 addition, 1 deletionboard/Marvell/db64360/mpsc.c
Loading
Please register or sign in to comment