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)
commit1a9c8f12f2f2824a047ebeb3ae342109677b48cc
tree588f8272242e085bd6f96e2c2df5fb0c0649a35e
parent0eaadecb40cf7cc7ca445215f5ef4d9dbb5b068a
parent9675f6107725a1002858df2246ebfb0cd3082e76
Merge branch 'master' of git://git.denx.de/u-boot-sh