]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
authorTom Rini <trini@ti.com>
Thu, 4 Apr 2013 16:01:27 +0000 (12:01 -0400)
committerTom Rini <trini@ti.com>
Thu, 4 Apr 2013 16:01:27 +0000 (12:01 -0400)

Trivial merge