Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Tue, 8 Jan 2013 15:28:27 +0000 (08:28 -0700)
committerTom Rini <trini@ti.com>
Tue, 8 Jan 2013 21:26:42 +0000 (14:26 -0700)
1  2 
include/configs/cm_t35.h

Simple merge