]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
authorTom Rini <trini@ti.com>
Fri, 21 Sep 2012 23:22:18 +0000 (16:22 -0700)
committerTom Rini <trini@ti.com>
Fri, 21 Sep 2012 23:22:18 +0000 (16:22 -0700)
1  2 
include/fdtdec.h
lib/fdtdec.c

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