From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 30 Jul 2014 16:01:04 +0000 (-0700)
Subject: Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux
X-Git-Tag: submit/tizen/20160607.132125~4221
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=26bcd8b72563b4c54892c4c2a409f6656fb8ae8b;p=sdk%2Femulator%2Femulator-kernel.git

Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux

Pull Exynos platform DT fix from Grant Likely:
 "Device tree Exynos bug fix for v3.16-rc7

  This bug fix has been brewing for a while.  I hate sending it to you
  so late, but I only got confirmation that it solves the problem this
  past weekend.  The diff looks big for a bug fix, but the majority of
  it is only executed in the Exynos quirk case.  Unfortunately it
  required splitting early_init_dt_scan() in two and adding quirk
  handling in the middle of it on ARM.

  Exynos has buggy firmware that puts bad data into the memory node.
  Commit 1c2f87c22566 ("ARM: Get rid of meminfo") exposed the bug by
  dropping the artificial upper bound on the number of memory banks that
  can be added.  Exynos fails to boot after that commit.  This branch
  fixes it by splitting the early DT parse function and inserting a
  fixup hook.  Exynos uses the hook to correct the DT before parsing
  memory regions"

* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux:
  arm: Add devicetree fixup machine function
  of: Add memory limiting function for flattened devicetrees
  of: Split early_init_dt_scan into two parts
---

26bcd8b72563b4c54892c4c2a409f6656fb8ae8b