Merge branch 'master' of git://git.denx.de/u-boot-nios
authorTom Rini <trini@konsulko.com>
Mon, 8 Feb 2016 14:39:54 +0000 (09:39 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 8 Feb 2016 14:39:54 +0000 (09:39 -0500)
commit7b6dc11c1aa69e5cc22d1659f50594edcfab5a9e
treece65e5e7efbf82d0223bcc4b7bf0efbf5648e953
parent5c884420a5752163ce738701701ae1874d8f466d
parente4f348ba6f070789e6505cc65cf6683421674637
Merge branch 'master' of git://git.denx.de/u-boot-nios