Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@konsulko.com>
Fri, 10 Apr 2015 13:38:38 +0000 (09:38 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 10 Apr 2015 15:54:07 +0000 (11:54 -0400)
commit59064346dd2713e5259a32d5ef55792a8f91171b
tree2192fa718f041119e9ba64a9d76f7fe7c546d480
parent6d0f45260846b8cafcae6a815178ff8ece7dea7a
parent412ae53aadb53cd63e754d638bafe6e426aeafee
Merge branch 'master' of git://git.denx.de/u-boot-arm