Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Sun, 15 Jan 2017 18:33:16 +0000 (13:33 -0500)
committerTom Rini <trini@konsulko.com>
Sun, 15 Jan 2017 18:33:16 +0000 (13:33 -0500)
commitcc422dae217924d9fe63258e39d309d84d70d437
tree46886e6238467fdc5506c2ce388a1be66bf2a551
parent45a0194b2b2ec494a0a18d5a02989f1b71906eae
parent7490130c9f8a4e17e858a38c767ad9ed64bd777b
Merge branch 'master' of git://git.denx.de/u-boot-sunxi