Merge branch 'master' of git://git.denx.de/u-boot-ubi
authorTom Rini <trini@ti.com>
Wed, 4 Feb 2015 18:30:00 +0000 (13:30 -0500)
committerTom Rini <trini@ti.com>
Wed, 4 Feb 2015 18:30:00 +0000 (13:30 -0500)
commit7f641d53bbb3a426a3bfb132d8346153e86a9d08
treee59a0aef74c8742a30a611342d39d7bfe06854dd
parent112db9407dd338f71200beb0fc99dffa8dcb57a8
parent040cc7b3beedecd971274a065564e39aac7fc76e
Merge branch 'master' of git://git.denx.de/u-boot-ubi