Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Thu, 23 Oct 2014 10:54:03 +0000 (06:54 -0400)
committerTom Rini <trini@ti.com>
Thu, 23 Oct 2014 10:54:03 +0000 (06:54 -0400)
1  2 
include/fdtdec.h
lib/fdtdec.c

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