Merge branch 'master' of git://git.denx.de/u-boot-dm
authorTom Rini <trini@ti.com>
Sat, 13 Sep 2014 20:32:52 +0000 (16:32 -0400)
committerTom Rini <trini@ti.com>
Sat, 13 Sep 2014 20:32:52 +0000 (16:32 -0400)
1  2 
common/board_r.c
include/fdtdec.h
lib/fdtdec.c

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