Merge branch 'master' of git://git.denx.de/u-boot-onenand
authorTom Rini <trini@ti.com>
Mon, 6 Jan 2014 18:48:36 +0000 (13:48 -0500)
committerTom Rini <trini@ti.com>
Mon, 6 Jan 2014 18:48:36 +0000 (13:48 -0500)
commit895ec893a9df56b915b6ca1fa2ceba8fad7faf3d
treed9fe1b4a5b7f6c8f33bb2af91a688316fa64e47c
parent2d51bc30366a2f1df86309fe6bb572107743f9dd
parent9b56942f7d2f67e620662cfeb4269a9a938d55da
Merge branch 'master' of git://git.denx.de/u-boot-onenand