Merge branch 'trini@ti.com' of git://git.denx.de/u-boot-staging