Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <trini@ti.com>
Fri, 23 Jan 2015 15:22:29 +0000 (10:22 -0500)
committerTom Rini <trini@ti.com>
Fri, 23 Jan 2015 15:22:29 +0000 (10:22 -0500)
commit3b95288a2ae8146ca4915250f815c1218b1706fa
tree6c690f6bcbee74f0c495d7ca646b93fde6be5262
parentec0cc98f2cb7fa217ed0a1a54978e2d8f2fbc20c
parent4e7c892d15e2aa98086aaacdb979821d011b7db2
Merge branch 'master' of git.denx.de/u-boot-sunxi