From: Otavio Salvador <otavio@ossystems.com.br>
Date: Thu, 15 Oct 2015 18:17:04 +0000 (-0300)
Subject: Merge remote-tracking branch 'origin/master' into 2015.10+fslc
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=982a6474ec320bcbd7513d7319e20d9ddb0f4cb0;p=bsp%2Fu-boot.git

Merge remote-tracking branch 'origin/master' into 2015.10+fslc

* 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
---

982a6474ec320bcbd7513d7319e20d9ddb0f4cb0