]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@ti.com>
Mon, 8 Dec 2014 14:36:26 +0000 (09:36 -0500)
committerTom Rini <trini@ti.com>
Mon, 8 Dec 2014 14:36:26 +0000 (09:36 -0500)

Trivial merge