]> code.ossystems Code Review - bsp/u-boot.git/commitdiff
Merge remote-tracking branch 'origin/master' into 2015.10+fslc
authorOtavio Salvador <otavio@ossystems.com.br>
Thu, 15 Oct 2015 18:17:04 +0000 (15:17 -0300)
committerOtavio Salvador <otavio@ossystems.com.br>
Thu, 15 Oct 2015 18:17:04 +0000 (15:17 -0300)
* origin/master:
  ARM: uniphier: fix address mapping in README.uniphier
  arm: vf610twr: improve memory layout
  colibri_vf: Fix bstlen field
  mtd: nand: vf610_nfc: resync with upstream Linux version


Trivial merge