]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Fri, 15 Jan 2016 02:51:32 +0000 (21:51 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 15 Jan 2016 02:51:32 +0000 (21:51 -0500)
1  2 
include/fdtdec.h
lib/fdtdec.c

Simple merge
diff --cc lib/fdtdec.c
Simple merge