Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@konsulko.com>
Wed, 8 Jul 2015 21:14:02 +0000 (17:14 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 8 Jul 2015 21:14:02 +0000 (17:14 -0400)
commitfb69b6cd270444c8d248e70e6be7c58f9828debd
tree487b0edd5d3fbf3bf324f58132c397cc2c81cc76
parentf3edfd30541d6f245d7dfa6fa7354cc916cc53e1
parentb11c5d1dc29e81326d1215011d19377737082aeb
Merge branch 'master' of git://git.denx.de/u-boot-mips