]> git.sur5r.net Git - u-boot/commit
Merge branch 'u-boot/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 9 May 2014 08:47:05 +0000 (10:47 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 9 May 2014 09:50:14 +0000 (11:50 +0200)
commitd2a3e911390f9fc4d8c0ee4b3c7fc75f4fd3fd19
treed71aae6d706d1f3b01da5f944e247abe308feea0
parent7904b70885f3c589c239f6ac978f299a6744557f
parent173d294b94cfec10063a5be40934d6d8fb7981ce
Merge branch 'u-boot/master'

Conflicts:
drivers/net/Makefile

(trivial merge)
Makefile
README
boards.cfg
common/env_mmc.c
include/configs/am335x_evm.h
include/fdt_support.h
include/image.h
tools/Makefile
tools/env/fw_env.c