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)

Trivial merge