]> git.ipfire.org Git - thirdparty/u-boot.git/commit
Merge tag 'v2014.04' into xilinx/master-next
authorMichal Simek <michal.simek@xilinx.com>
Tue, 15 Jul 2014 11:35:24 +0000 (13:35 +0200)
committerMichal Simek <michal.simek@xilinx.com>
Wed, 16 Jul 2014 13:29:22 +0000 (15:29 +0200)
commit8ffced95b73a3bfa080ecc63261a9c6de3f2fe45
tree13839b7bf7efc6643ee200107dae7d80178365ab
parent86f6b5f0a11a09b734050a7d673059d9d5152404
parentdda0dbfc69f3d560c87f5be85f127ed862ea6721
Merge tag 'v2014.04' into xilinx/master-next

Not so many merge conflits with mainline.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
26 files changed:
Makefile
README
arch/arm/cpu/armv7/zynq/cpu.c
arch/arm/cpu/armv7/zynq/spl.c
arch/arm/include/asm/arch-zynq/spl.h
arch/arm/include/asm/arch-zynq/sys_proto.h
arch/arm/lib/bootm.c
board/xilinx/zynq/Makefile
board/xilinx/zynq/board.c
boards.cfg
common/Makefile
common/spl/spl_mmc.c
drivers/fpga/zynqpl.c
drivers/mtd/spi/sf_ops.c
drivers/mtd/spi/sf_params.c
drivers/mtd/spi/sf_probe.c
drivers/net/xilinx_emaclite.c
drivers/net/zynq_gem.c
drivers/usb/host/Makefile
fs/fat/fat.c
include/config_cmd_all.h
include/configs/zynq-common.h
include/fat.h
include/netdev.h
include/spi_flash.h
spl/Makefile