From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Oct 2013 00:14:13 +0000 (-0700)
Subject: Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux
X-Git-Tag: v3.12-rc6~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=34ec4de42be5006abdd8d0c08b306ffaa64d0d5d;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

Pull device tree fixes and reverts from Grant Likely:
 "One bug fix and three reverts.  The reverts back out the slightly
  controversial feeding the entire device tree into the random pool and
  the reserved-memory binding which isn't fully baked yet.  Expect the
  reserved-memory patches at least to resurface for v3.13.

  The bug fixes removes a scary but harmless warning on SPARC that was
  introduced in the v3.12 merge window.  v3.13 will contain a proper fix
  that makes the new code work on SPARC.

  On the plus side, the diffstat looks *awesome*.  I love removing lines
  of code"

* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux:
  Revert "drivers: of: add initialization code for dma reserved memory"
  Revert "ARM: init: add support for reserved memory defined by device tree"
  Revert "of: Feed entire flattened device tree into the random pool"
  of: fix unnecessary warning on missing /cpus node
---

34ec4de42be5006abdd8d0c08b306ffaa64d0d5d